Commit chase's changes.
Merge branch 'master' of https://github.com/roberttstephens/not_uniformity

Conflicts:
	app/templates/service_add_edit.html