bs3 compat
v1.1 - bs3
v1.1 - bs3
Merge branch 'bootstrap3'

Conflicts:
	CHANGES.txt
	setup.py