initialized modules
Merge branch 'master' of https://github.com/humannsa/nsa
Merge branch 'master' of https://github.com/humannsa/nsa

Conflicts:
	app.js
path to test views working, highcharts failing