restrictor test WIP ahhahsasf
Merge remote-tracking branch 'origin/master'

Conflicts:
	Shelter/Restrictor.php
	tests/acceptance/Restrictor.Test.php
	tests/acceptance/implementations/model/Icebox.php