Changes made on the server
Megred livechanges
Finished merge of live server code and fixed a typo.