Adding the near-final side-menu and some other awesome stuff!
Merge remote-tracking branch 'origin/master'