Fix for #356
Merge remote-tracking branch 'origin/master'

Conflicts:
	dist/js/bootstrapValidator.min.js