hjkl
Merge branch 'master' of https://github.com/momoplan/gameiphone

Conflicts:
	GameGroup/FriendPage/SearchJSViewController.m
	GameGroup/GameGroup/GameGroup-Prefix.pch
	GameGroup/LoginAndRegister/BangdingRolesViewController.m
	GameGroup/LoginAndRegister/RegisterViewController.m
	GameGroup/LoginAndRegister/SearchRole/SearchRoleViewController.m
	GameGroup/MePage/Character/AddCharacterViewController.m
	GameGroup/PublicClass/Class/GameCommon.m