Preparations for ass nr 0
Merge branch 'master' of http://github.com/traed/PROP