Made changes to the server so it can return a cross origin allowed header in a few responses
Merged repo changes to my local changes and fixed one travis error