[REF] console.log deleted
[REF] added 'px' to be clear
[ENH] fix horizontal alignment for model select encourage popover
[BUG] overlay is only displayed if there is no default and no preselect set
Merge branch 'master' of github.com:ndap/magento
Merge branch 'refs/heads/master' into develop
Merge branch 'master' of github.com:ndap/magento
Merge branch 'develop' of github.com:unlooped/cpk into develop
Revert "Merge branch 'unlooped' of github.com:n3o77/cpk into develop"

This reverts commit 7a32b148bbef10ab3f3895cebdbf4d403926b01a, reversing
changes made to 1a67e305fbb85d210161d79eecea741f86e4b736.

Conflicts:
	app/code/local/Cpk/Etl/Helper/Data.php
	app/etc/modules/AW_ARUnitManufacturer.xml
Merge branch 'master' of github.com:ndap/magento
Merge branch 'refs/heads/master' into develop
Merge branch 'feature/ticket-498-encouragepopup' into develop
Merge branch 'develop' of github.com:unlooped/cpk into develop

Conflicts:
	js/argon/VehicleChooser.js
Merge branch 'develop' of github.com:unlooped/cpk into develop
Merge branch 'refs/heads/develop'