cityup temp
Merge branch 'master' of github.com:kevin4314/HTC

Conflicts:
	feature/cityup/1.txt