setting up controllers
Merge branch 'mockups'
refactoring, integrating doctrine