Merge branch 'master' into develop
Removing all that shit
Merge branch 'develop'