fixed saas_2005
Fixed conflict.

Conflicts:
	utils/util.py
Merge branch 'feature/saas_2005' into develop