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

Conflicts:
	www/assets/js/controllers.coffee
	www/js/controllers.js
	www/partials/mydata.html
forms fill out