Merge pull request #7 from genu/dashboard

Dashboard update
time entry backend
Merge branch 'gh-pages' of https://github.com/jkindle88/nullpointerexception into gh-pages

Conflicts:
	js/app.js

dashboard today backend
Merge pull request #8 from jkindle88/gh-pages

Dashboard backend updates
Merge with JOE