added context function
added context function
added context function
Merge branch 'master' of https://github.com/limichaelc/PTX2

Conflicts:
	ptx2app/views.py
Merge branch 'master' of https://github.com/limichaelc/PTX2

Conflicts:
	ptx2app/views.py
context coursepage
context coursepage