using new carousel which has more event hooks
Merge branch 'master' of github.com:RSV2/foliage

Conflicts:
	dist/app.js
	dist/app.js.map
	js/app/views/layout/navigation.js