创建分支
Merge branch 'dev' into dev-ywt
修改了布局文件
添加主界面
合并dev-hzx分支
合并dev-ls分支

Conflicts:
	res/layout/activity_tab_bottom.xml
	res/values/activity-strings.xml
	src/com/pmp/ppmoney/PPMoneyApplication.java
	src/com/pmp/ppmoney/activity/LoginActivity.java
合并dev-ls分支
解决冲突
Merge branch 'dev' into dev-ls
合并分支