v3.1.0
Merge branch 'develop'

Conflicts:
	dist/css/bootstrap2/bootstrap-switch.min.css
	test/bootstrap-switch.js