Cleaning up backend code
Merge branch 'master' of https://github.com/yavorg/samples