fixing controller flow
Merge branch 'sandile' of https://github.com/skeswa/tendo.io into sandile