about, map
Merge branch 'misc2'
forms, links
Merge branch 'misc3'
Merge branch 'master' of https://github.com/bceskavich/compasapp

Conflicts:
	log/development.log
commit