minor style changes
Merge branch 'master' of github.com:smart-cow/moo

Conflicts:
	app/js/activity-types-lib.coffee