warehhouse 2 bugs were fixed
Merge branch 'master' of github.com:AramisIT/GreenHouse