Merge branch 'dev2' into obj-c
Merge branch 'obj-c' into develop
Merge branch 'develop' of https://github.com/jmmaloney4/diamond into develop