start synchronization
tangpeng
Merge branch 'master' of
https://github.com/hellocountryman/hellocountryman.git

Conflicts:
	project.properties
	src/com/example/laoxianghao/MainActivity.java