JSON based assignment submissions
Merge branch 'master' of https://github.com/courseportal/coursePortal

Conflicts:
	assignment/templates/question/test.html