make changes to mkturk template
update
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/myturk/createhit.html