testing changes
fix the student course history
Merge branch 'master' of https://github.com/hadimuhammad/InPress

Conflicts:
	inPress/module/admin.pyc
	inPress/module/models.pyc
	inPress/module/views.pyc
	inPress/student.txt