last changes in installer
Merge remote-tracking branch 'origin/master'

Conflicts:
	MANIFEST.in
	setup.py