Merge branch 'feature/fix_resize_detection' into develop

Conflicts:
	dist/angular-carousel.min.js
Dev version