take into account noUniqueType=CS
Merge branch 'master' of https://github.com/EPX/epx2013

Conflicts:
	actsIdsValidation/models.py