make carousel tile configurable
Merge branch 'master' into issue_220

Conflicts:
	docs/HISTORY.rst