Editable Fields
Merge branch 'master' of https://github.com/feeeermendoza/we-work-with-mammograms

Conflicts:
	app/controllers/Application.java