Merge pull request #20 from moog16/master

merged gruntfile with martin's and aysegul
WIP for fb login redirect
updated map with pin that doesn't move
Merge pull request #22 from emailnitram/master

updated map with pin that doesn't move
Merge pull request #21 from eddyfh/master

WIP for fb login redirect
added css and plugin to maps
Merge pull request #23 from emailnitram/master

added css and plugin to maps
Merge branch 'master' of https://github.com/meamstack/meetmeapp

Conflicts:
	www/index.html