New model spec into modals
Modularizing, restructuring components
Katie's Modal Changes
DB Controller changed for new JSON format
DB Controller update
Merge branch 'katie'
reports update 3-27
Data in data table new display
Merge branch 'reports-ongoing'
Merge branch 'katie'
Merge branch 'alex'

Conflicts:
	ncr_server.py
	static/assets/js/ncr/controllers/DBController.js
	templates/.DS_Store
	templates/pages/database/components/.DS_Store
	templates/pages/database/components/dataTable.html
	templates/pages/database/components/lifDetails.html
	templates/pages/database/components/modelSearch.html
	templates/pages/reports/reports.html
DB Fixes for Channel Types
Added neuron type filters
Added Neuron type filters
Quick Fix
Merge branch 'master' of https://github.com/BrainComputationLab/ncr
Delete UserManager.js
Delete DBManager.js
Delete UserController.js~
Delete models.js