fix slider + add url nivo-slider.css
Merge remote branch 'upstream/master'

Conflicts:
	theme-assets/assets-frontoffice/assets-mcommerce-resources/src/main/resources/themes/default/js/page.store-locator.js
fix slider
Merge pull request #21 from baotran109/master

fix slider + add url nivo-slider.css