추
Merge branch 'master' of https://github.com/ShonKangYoul/AndroidProject

Conflicts:
	ContactManager/bin/ContactManager.apk
	ContactManager/bin/R.txt
	ContactManager/bin/classes.dex
	ContactManager/bin/jarlist.cache
	ContactManager/bin/resources.ap_
	Lib_CommonUtils/bin/lib_commonutils.jar