Initial play app
Init bootstrap and coffee
Merge pull request #1 from jetchegaray/feature/initial-setup

Feature/initial setup
Add basic navigation and header for account pages
Add dashboard mockup
Add Civil mockup
Set Java 1.7 for Heroku
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
Merge branch 'feature/mockups' into develop
subo el sign in up integrado a los mockups. la proxima los hago en un branch ..