test
Merge branch 'master' of
https://github.com/SoftWest/Let-s-come-together.git

Conflicts:
	Let's come together/res/layout/act_map.xml
add click status