Synchronized tizen_2.1 branch with master