Merge
Merge branch 'master' of https://github.com/randopedia/randopedia

Conflicts:
	randopedia-web/client/css/site.css
Merge