Merge with master files
Merge remote-tracking branch 'origin'

Conflicts:
	taassignment/templates/course/public_view_list.html
Add staff view