subo user y morphia
Merge branch 'feature/mockups'

Conflicts:
	app/assets/javascripts/application.coffee
	app/controllers/Mockup.java
	app/views/main.scala.html
sss
Merge branch 'master' into feature/mockups