Merge branch 'master' of https://github.com/Yonet/meetMeApp
Merge pull request #54 from emailnitram/master

merged changes with ed
route added for walkthrough
styling changes to event view
merged with upstream master
corrected spelling in map styl
Merge pull request #55 from Yonet/master

style changes to view activity page
working photo saving
changed image quality to 14
css is responsive in all pages
Merge branch 'master' of https://github.com/meamstack/meetmeapp
WIP cleaning up map page
Merge pull request #56 from eddyfh/master

WIP cleaning up map page
Merge branch 'master' of https://github.com/meamstack/meetmeapp
added responsive layout to all pages
Merge pull request #57 from Yonet/master

all the pages are responsive
Merge branch 'master' of https://github.com/meamstack/meetmeapp
swiping on walkthrough works
Merge branch 'master' of https://github.com/meamstack/meetmeapp into walk

* 'master' of https://github.com/meamstack/meetmeapp:
  added responsive layout to all pages
  WIP cleaning up map page
  css is responsive in all pages
  corrected spelling in map styl
  styling changes to event view

Conflicts:
	www/views/createActivity.html
WIP added styling to Map page