get new version from Nick
lecture note
Merge branch 'master' of https://github.com/courseportal/coursePortal

Conflicts:
	web/admin.py
	web/views/home.py
lecture note