single activity update working
Merge branch 'master' of https://github.com/moabe/meetingPlanner

Conflicts:
	index.html
	js/app.js