reverted last breaking commits
Merge branch 'master' of ssh://github.com/Fingerpaint/project-code