Merge branch 'master' of bootstrapvalidator.github:ethernet-zero/bootstrapvalidator

Conflicts:
	src/js/validator/zipCode.js
Merge branch 'master' of bootstrapvalidator.github:ethernet-zero/bootstrapvalidator