refactor some models and controllerS
Merge branch 'master' of github.com:rkrdo/sepap2