stuff
Merge branch 'master' of https://github.com/boltymac/fieldmotion

Conflicts:
	j/utilsdb.js