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