Rearranging menus to make room for new features
Redirecting to longer cached gui after logins.
Merge pull request #453 from fariqsaid/master

Merging Wah Chun's updates to schoolregistration
Merge pull request #4 from engsen/master

Minor change to profile page
Added in Map partial as well as modifications for angular-leaflet-directive
Merge remote-tracking branch 'upstreamFariq/master'
Adding in Genshyft changes without index.html change.
Manually merging the index.html pages for the team.
resolved conflict with merge
updating to latest version
Adding WebGameController and supporting pages.
Touch-ups to WebGameController
Merge remote-tracking branch 'upstream2/master'
update to schoolsmap and schoolcontroller to draw data and load markers dynamically
added static data for testing of markers for maps
edited get_markers function to try and take in data dynamically