Working towards the 1.1 release
Merge branch 'master' of git@github.com:SirFaizdat/Prison.git
Working towards the 1.1 release.