jirasop
Merge branch 'master' of https://github.com/prmejc/am3

Conflicts:
	app/assets/javascripts/form.coffee
	app/assets/javascripts/utils.coffee
	app/controllers/WorkController.java
	conf/application.conf
	conf/routes