Completed requirement for next revision.
Merge master into r2_index

Conflicts:
	web/index.html