Conflicts:
	gwtbootstrap3/src/main/java/org/gwtbootstrap3/client/ui/Column.java