bump develop version to 1.2
change setup.py to 1.1.1
Merge branch 'release/1.1.1' into develop

Conflicts:
	setup.py