categories on sidebars
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/tmpl/sidebar.tpl.php
basic user login
basic user login