Refactoring and moving behavior to controllers
Merge branch 'master' of github.com:rcarmo/yaki-tng