layout + controllers
Merge branch 'master' of https://github.com/mmattm/fbuilder