s
Merge branch 'master' of github.com:thijsh/HLP-

Conflicts:
	HLP/www/taskdetails.html