prepare for automatic 2to3 translation
Merge branch 'master' into python3

Conflicts:
	appconfig/appconfig.py