FakeSetting
Merge branch 'Gants2'

Conflicts:
	TizenProject/.sdk_delta.info
	TizenProject/.sign/.manifest.tmp
	TizenProject/.sign/author-signature.xml
	TizenProject/.sign/signature1.xml