:neckbeard: Added .gitattributes & .gitignore files
add
合并收款
发布第一个合并版
周祥
预付酒店、票面价、停到站
去掉多余的引用
在修改当天担保
周祥那边有更改
注册手机号验证及高度调整
合并把注册验证丢了
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	AndroidManifest.xml
	proguard-project.txt
	project.properties
	res/layout/activity_register.xml
	res/layout/activity_train_booking.xml
	src/com/jike/shanglv/ActivityInternationalRequisitionForm.java
	src/com/jike/shanglv/ActivityTrainBooking.java
	src/com/jike/shanglv/Activity_Register.java
	src/com/jike/shanglv/MyApp.java
	src/com/jike/shanglv/NetAndJson/HttpUtils.java
	src/com/jike/shanglv/ShipCalendar/MainActivity.java
	src/com/jike/shanglv/Update/UpdateManager.java