login and reigter
home
Merge branch 'master' of github.com:jiaoyuguanjia/jygj-android

Conflicts:
	wuyaapp/res/layout/activity_home.xml
	wuyaapp/res/layout/activity_register.xml