Merge branch 'development' of github.com:templesmc/smc-themes into development