controller maintenance as open-classifieds/open-eshop#284
closes #950
closes #953
closes #950
Merge remote-tracking branch 'upstream/master'