Floating Add activity list!
Merge branch 'master' of https://github.com/moabe/meetingPlanner

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