Commented out some resources that isn't used anymore and is causing errors.
fixed enable of modules now in correct order
other sound for breaking items
Merge remote-tracking branch 'refs/remotes/origin/master' into rewrite-logging