17:48PM, 28th DEC 
Merge remote-tracking branch 'origin/master' into guocheng

Conflicts:
	.classpath
	AndroidManifest.xml
	res/layout/activity_confirmation_dialog.xml
	res/layout/activity_phone_number.xml
	res/values/strings.xml
	src/com/neutronstar/neutron/Appstart.java
	src/com/neutronstar/neutron/ConfirmationDialogActivity.java
	src/com/neutronstar/neutron/NeutronContract.java
	src/com/neutronstar/neutron/PhoneNumberActivity.java
	src/com/neutronstar/neutron/SignUpInfoActivity.java
	src/com/neutronstar/neutron/VarificationCodeActivity.java
	src/com/neutronstar/neutron/Welcome.java
20:27PM, 31st DEC
Appstart与最新servlet契合，增加了servlet无反馈情况处理
20:49PM, 31st DEC
Appstart与最新servlet契合，增加了servlet无反馈情况处理
23:00PM 31st DEC
完成获取验证码
17:45PM 1st JAN, 2014
注册功能代码，插入数据库代码需要调整
18:30PM, 1st JAN, 2014
修改登录方法，等待和服务器调试
Merge remote-tracking branch 'origin/master' into guocheng