carousel flexible configuration
Merge branch 'develop'

Conflicts:
	test/dev/index.html