// calendar
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Conflicts:
	admin-dev/themes/default/template/helpers/calendar/calendar.tpl
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap