Update to master
Merge branch 'master' of github.com:rphuber/boox
adds swap pages, controllers, and routes
fixes navbar conflicts