Action Complete
Merge branch 'master' of https://github.com/hellocountryman/helloman.git

Conflicts:
	src/com/feytuo/laoxianghao/MainActivity.java
	src/com/feytuo/laoxianghao/adapter/ListViewAdapter.java