Moved 2 classes to reserve controller
Merge branch 'Pawel'