Riverview added in
Merge branch 'qing-guo' of https://github.com/elin9/TeamMIA into qing-guo

Conflicts:
	index.html
	login.html