Fixed up styling on create activity page, scrolling would be next step to fix
Merge branch 'master' of https://github.com/eddyfh/meetMeApp into eddyfh-master

* 'master' of https://github.com/eddyfh/meetMeApp:
  Fixed up styling on create activity page, scrolling would be next step to fix

Conflicts:
	www/js/controllers/map.js
	www/js/services/userData.js
	www/styles/stylus/createActivity.styl
	www/views/createActivity.html