Merge branch 'develop' of github.com:usersource/anno into feature/ios8
Merge branch 'feature/ios8' of github.com:usersource/anno into feature/ios8