修改bug 2014-9-26 21：05 Lucifer
Merge branch 'master' of https://github.com/Andy-Yin/iOS51rcProject

Conflicts:
	iOS51rcProject/LogIn/Login.storyboard