Merge branch 'tizen_dev' into tizen

Change-Id: I0f4a1a911999076720d36356f7ca0236083872b8

diff --cc contacts-app/.cproject
Simple merge

diff --cc contacts-widget/.cproject
Simple merge

diff --cc contacts-widget/src/Widget.cpp
Simple merge

diff --cc lib-apps-common/.cproject
Simple merge

diff --cc lib-common/.cproject
Simple merge

diff --cc lib-contacts/.cproject
Simple merge

diff --cc lib-logs/.cproject
Simple merge

diff --cc lib-phone/.cproject
Simple merge