controller changes
Merge branch 'backend' of https://github.com/StickMen/KungFuRhino into backend