teseting
Merge remote-tracking branch 'origin/Niel' into Niel

Conflicts:
	r2/r2/templates/sharelink.html
tesetinga1