Changes from demo night, removed dev server
Merged