Update Bundle install
Update controller actions
Merge branch 'master' of github.com:JKO/co-crea
Update template layout, update questions views
Fix merge conflicts
Fix merge conflicts