9.22
Merge branch 'master' into local_v4

Conflicts:
	app/assets/stylesheets/application.css
	public/assets/application-88645f640055d1e29f9c39b74a3a6544.css
	public/assets/application-88645f640055d1e29f9c39b74a3a6544.css.gz
	public/assets/manifest-7e8817de03660cbe30832c444cb77e8f.json
Merge pull request #10 from manchesterfish/local_v4

9.22