pulling
Merge branch 'master' of github.com:lingz/oneform-citizen-mobile

Conflicts:
	www/assets/js/app.coffee
fix bugs