added moment and date parsing
Merge branch 'master' of https://github.com/drc/insight

Conflicts:
	app/layouts/service.js