First pages commit
maps pages
remove git merge stuff
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
fb login button tweak