add all mod
Merge branch 'master' of https://github.com/dengbo/test_login_12306

Conflicts:
	src/com/dengbo/test/MainActivity.java