updated models with assignment admin
Merge branch 'develop' into pavan-branch

Conflicts:
	teamproject/.idea/workspace.xml
	teamproject/insync/admin.py
	teamproject/insync/models.py