no message
Merge branch 'master' of https://github.com/gkdlfm/CML

Conflicts:
	DdongGame/DdongGame/bin/DdongGame.apk
	DdongGame/DdongGame/bin/resources.ap_
	DdongGame/appcompat_v7/bin/android-support-v7-appcompat.jar