fixed bad merge
Merge branch 'devel'

Conflicts:
	zendesktest/views.py