Changes overall
Changes on modules from katakrak.net
Merge branch 'master' into redisign