Merge branch 'master' of https://github.com/vivianspencer/bootstrap-application-wizard into vivianspencer-master

Conflicts:
	src/bootstrap-wizard.min.js