BF|PM: fix carousel bug
Resolves #21
Merge remote-tracking branch 'origin/master'

Conflicts:
	dist/scripts/toolkit.js