server gui is now optional; use -gui flag to enable it
Merge origin/staging into staging