Merge origin/master

Conflicts:
	Medsio/public_html/index.html