1.0 Full functionality reached.
1.0 Full functionality reached.
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/css/main.css
	assets/css/public.css
	htmls.inc.php
	lib/ranking.inc.php
1.0 Full functionality reached.