Merge pull request #1 from SirLazarus/master

Removal of FILE_DIR dependency and resolution of issue #111
Implements #140
Partial fix for #143, currently disabled due to underlying problem. See https://github.com/HypatiaStation/HypatiaStation/issues/143 for details.
Fixes #144
#145 Updates to the browser control.
#145 Implementation of the browser control in the power monitor.
Merge pull request #2 from HypatiaStation/master

Update from upstream
#154 Various fixes for the map. It will compile now, but it's not yet ready for production.
Merge pull request #141 from nullquery/master

Pull request for #140