Merged latest master code with this branch
Fixed Server.js merge conflicts and added iOS stuff