updated dev-version to 3.5.7
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	setup.py
Screenshort added