removed features
Merge branch 'master' into dev

i forgot one thing with a line in .module