Revert "增加了我的2中对message的对接，登陆存入用户名"

This reverts commit 37a31aad627b6b0b9dd9d445c47df56bcb4b768b.
login的edit增加了单行输入
点击登陆可以进入my——second，点击站内信进入站内信界面
Merge branch 'pr/1' into SecondMergeTest

Conflicts:
	bin/Civitas.apk
	bin/classes.dex
	bin/classes/linyxy/civitas/FullscreenActivity$loginButtonListener.class
	bin/classes/linyxy/civitas/FullscreenActivity.class
	bin/classes/linyxy/civitas/R$layout.class
	bin/classes/linyxy/civitas/R$string.class
	bin/classes/linyxy/civitas/R$style.class
	bin/classes/linyxy/civitas/R$styleable.class
	bin/classes/linyxy/civitas/SQLiteActivity.class
	bin/classes/linyxy/civitas/SpeechList.class
	bin/classes/linyxy/civitas/messages.class
	bin/classes/linyxy/civitas/my_second.class
	bin/resources.ap_
	gen/linyxy/civitas/R.java
	res/values/strings.xml
	src/linyxy/civitas/FullscreenActivity.java
	src/linyxy/civitas/SQLiteActivity.java
	src/linyxy/civitas/messages.java
mergeSecond