add directives back into dashboard; tweaks to details directive
Merge branch 'objObj' of github.com:Sextant-WDB/sextant-ng into objObj

Conflicts:
	routes/data-routes.js
Merge branch 'objObj' of github.com:Sextant-WDB/sextant-ng into objObj
add watch on templates dir for grunt and update eventType key in details template
create page graph directive
Fuxors all the things! <Mic drop>
Merge branch 'pagegraph' of https://github.com/Sextant-WDB/sextant-ng into mergeTest

Conflicts:
	Gruntfile.js
	app/app.js
	app/views/dashboard-view.html
	build/scripts.js
	build/views/dashboard-view.html
	routes/data-routes.js
Update graph with heat map
Tidy up the graph styling a little more
Merge branch 'pagegraph' of https://github.com/Sextant-WDB/sextant-ng into styling
Update for heroku