Add the backend bits for userlists and activating users
Merge branch 'upstream/master'
Use the new functionality splitting conventions
Merge pull request #4 from boom1992/master

Add the backend bits for userlists and activating users
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.php