chg user agreement, misc edits
Merge remote-tracking branch 'origin/master'

Conflicts:
	resources/css/style.css
move contents down v1
change