Several small changes
Merge branch 'master' of https://github.com/tsaxton/datatrack

Conflicts:
	includes/js/observations.js