Merge branch 'master' into v0.5.0

Conflicts:
	dist/js/bootstrapValidator.min.js