Revert 7008ac5..653deb0

This rolls back to commit 7008ac5cfb34572560b51c407518af88f6d9e295.
Revert 653deb0..31a2a5a

This rolls back to commit 653deb0b001ff29e16a3ee828fca1d23ba098524.
Revert 33ba60a..3c8cffb

This rolls back to commit 33ba60af08913b96e207235df5fa0ba6adba802e.
Merge branch 'master' of https://github.com/studioatem/test