Sync with master. Added missed files on tizen_2.1 branch