Many changes
Merge branch 'master' of git@github.com:georgeherby/Totalitea.git