prepare for master
merg
Merge branch 'master' into DX
merge finish
1
1
Merge branch 'DX' of https://github.com/blockdate/KBLove into DX

Conflicts:
	KBLove.xcodeproj/project.pbxproj
	KBLove/en.lproj/Regist_Login_Storyboard.storyboard