Versionando
Merge remote-tracking branch 'origin/master' into redecard

Conflicts:
	setup.py
Versionando
Merge branch 'redecard'