Finished off all testing with merging of GUI and Server, display settings still not put back in, still bug issues to solve, can be merged to current master