new html course and modification of Course models.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	courses/models.py
	courses/urls.py