edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/img/logo_black.png
	assets/js/bootstrap-slider.js
	assets/js/categories.js