Merge branch 'master' into develop
Animate transitions between scenes
Merge pull request #35 from massix/develop

Animate the transitions between the different scenes
Merge branch 'develop' of https://github.com/orwell-int/client-ios into develop
Merge branch 'develop'