convenient carousel option update
Merge branch 'master' of github.com:moovweb/uranium into ie

Conflicts:
	build/src/uranium.js