Merge branch 'roll-my-own-js' of https://github.com/crmackay/batey-data-app into roll-my-own-js

Conflicts:
	form_app/client_side/todo.md
fixed conflict