Convert to modern Objective-C syntax as suggested by Xcode
Further conversion to modern syntax
Merge branch 'feature/modern-objective-c-and-arc' into develop