Prepare for heroku
Integrate layout into grails app
Merge Cristiano's changes