Changed the uml
Working on fix for addons
Merge branch 'master' into addon-fix
Changed the uml
Working on fix for addons
Reversed a condition..
Fixed conflict
Hopefully the addons are removed now