Merge branch 'origin/develop'

Conflicts:
	dist/smartbox.min.js