added badges in sidebar
Merge remote-tracking branch 'origin/master'

Conflicts:
	UID-new/register.php