small fix
fix registration controller
Merge branch 'dev' of http://github.com/yupe/yupe into dev
Merge branch 'dev' into 0.8