latest
Merge branch 'dev' of github.com:jarkelen/groundexplorer-meteor into dev

Conflicts:
	lib/collections/visits.js