swift fixes
Merge branch 'develop' of github.com:championofblocks/MagicalRecord into develop