m2m for templates
Merge branch 'master' of https://github.com/courseportal/coursePortal
small change
Merge branch 'master' of https://github.com/courseportal/coursePortal
improved views, adding interface
Merge branch 'master' of https://github.com/courseportal/coursePortal

Conflicts:
	assignment/templates/assignment/index.html
	assignment/templates/assignment_nav.html
	web/templates/base.html