Login
Merge branch 'develop' of https://github.com/Elpieich/teamwork into develop

Conflicts:
	crm/apps/admin/views.py
	crm/models/role.py