Commit
Nuevo Staff
Merge branch 'missing_mockups' of github.com:feeeermendoza/we-work-with-mammograms into missing_mockups

Conflicts:
	app/controllers/Application.java
	app/views/editPatient.scala.html
	conf/.routes.swp
	conf/routes
Hook up contact to navbar and add admin scope to staff#new route