Fixing models
Merge branch 'master' of github.com:medo/elmasla7a
More controller fixes