Refactoring to work with next server architecture.
Merge branch 'master' of github.com:POV7DandelionKing/iOSClient