message 코딩컨벤션 확

Signed-off-by: LeeJeongHo <ljh721635@huray.net>
Merge branch 'master' of https://github.com/LeeJeongHo/Hong3

Conflicts:
	AndroidManifest.xml.BASE.xml
	AndroidManifest.xml.LOCAL.xml
	AndroidManifest.xml.REMOTE.xml