some changes

Conflicts:
	comparison.html
Merge branch 'develop'