1
Merge remote-tracking branch 'origin/master'

Conflicts:
	testmanager/templates/index.html
1