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
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