根据软键盘的弹出和收回动态改变界面布局
Merge branch 'develop' of https://github.com/wangwang4git/4MyLove

Conflicts:
	AndroidManifest.xml
Merge pull request #30 from ljp215/master

增加登录界面根据软键盘改变界面布局的功能