// cleaned admin-theme.js - added date range picker
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Conflicts:
	admin-dev/themes/default/js/admin-theme.js