Solving #1590

Conflicts:
	kalite/facility/forms.py
Merge pull request #1738 from bcipolli/1590

Solving #1590