Add basic navigation and header for account pages
Add dashboard mockup
Add Civil mockup
Set Java 1.7 for Heroku
Merge branch 'feature/mockups'

Conflicts:
	app/assets/javascripts/application.coffee
	app/controllers/Mockup.java
	app/views/main.scala.html
sss