Merge branch 'master' into server-link

* master:
  Fixed navigation menu being pushed out of the frame
Fixed server loading bug
Merge branch 'server-link' of github.com:Hyperactivity/android-app into server-link

* 'server-link' of github.com:Hyperactivity/android-app: