Merge changes I2000a9cb,Id6a4b8ce into tizen_2.2
-rw-r--r-- 39560 .cproject
-rwxr-xr-x 2913 .project
-rw-r--r-- 1118 CMakeLists.txt
-rw-r--r-- 11001 LICENSE.Flora
-rw-r--r-- 236 NOTICE
drwxr-xr-x - inc
-rw-r--r-- 6768 manifest.xml
drwxr-xr-x - packaging
drwxr-xr-x - res
drwxr-xr-x - shared
drwxr-xr-x - src