Adding fancybox
added colorbox
installed bundle
removed colorbox folder from precompiled assets list
removed colorbox import from application.css
small changes to db
fixed merge conflicts
fixing template option for page