Merge branch 'master' of github.com:t4t5/sweetalert

Conflicts:
	lib/sweet-alert.js
	lib/sweet-alert.min.js