fu
Fu
Merge branch 'master' of https://github.com/tkim371/repository

Conflicts:
	Proj_usingTemplate/Modroid_App/bin/Modroid_App.apk