Permissions update progress
Merge branch 'master' into dev
Merge branch 'master' into dev
Merge branch 'master' into dev

Conflicts:
	issues/views.py