-merged with the client-side (non-logged-in), done by Chris
-moved all the AngularJS, admin-module, client-module and textAngular inclusions to one place in the layout.jade so that everything is imported smoothly and without error