merged spring/develop into majboredom/develop
Merge branch 'develop' of https://github.com/MajBoredom/spring into develop