Modif 130809
Merge branch 'master' of https://github.com/certae/ProtoExt

Conflicts:
	src/settings.py