stage02 and stage 03
Merge branch 'develop' of https://github.com/dpek/dissociative-tank-disorder into develop