Preparing release 1.7.2
Merge branch 'develop'

Conflicts:
	CHANGES
	setup.py
Preparing release 1.7.3
Back to development: 1.7.4
Fix tests of template tag
Prevent colors to be cleaned from text fields