Cleanup.
Updates.
Merge branch 'develop' into feature/optionsView

ý`q
Merge branch 'develop' into feature/optionsView

g sssssssssý`ý`ý`:q
Restore server.coffee?
Merge branch 'feature/optionsView' into develop

g sssssssssý`ý`:q