styling activities
Merge branch 'master' of https://github.com/moabe/meetingPlanner

Conflicts:
	js/controllers/popUpViewController.js