2014.08.01
2014.08.12
Merge branch 'pji'

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