aa
jjjkk09
haha
wow
comm
Merge branch 'pji4'

Conflicts:
	TizenProject/.cproject
	TizenProject/.sdk_delta.info
	TizenProject/.sign/.manifest.tmp
	TizenProject/.sign/author-signature.xml
	TizenProject/.sign/signature1.xml
	TizenProject/inc/AppResourceId.h
	TizenProject/inc/SceneRegister.h
	TizenProject/inc/Toast.h
	TizenProject/src/AppResourceId.cpp
	TizenProject/src/SceneRegister.cpp
	TizenProject/src/TizenProjectFormFactory.cpp