Correcting homepage river number.
Fixing sideoptions when on bottom.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	templates/reader/welcome.xhtml