Fixed single activity not changing time when on a day
Merge branch 'master' of https://github.com/moabe/meetingPlanner

Mixed work done over same view

Conflicts:
	index.html
	js/app.js
Merge branch 'master' of https://github.com/moabe/meetingPlanner

Conflicts:
	index.html