Merge branch 'feature/projectadmin'
refactor to automatically include the right JS files for a particular angular app.  Got rid of CI view/app folder - now there is just one template for all apps
first attempt at a CIService - service which exposes code igniter variables in javascript
Merge branch 'refactor/codeigniter'
Merge branch 'feature/projectadmin'
Merge remote-tracking branch 'origin/master'