Merge branch 'master' into gh-pages
Added maps to the tabs. Added the stub views.
Added some work for google maps.
Merge branch 'gh-pages'