GitLab

Merge branch 'stats' of git@gitorious.org:mahara/mahara into stats

Conflicts:
	htdocs/lang/en.utf8/admin.php
	htdocs/lib/registration.php
	htdocs/theme/raw/templates/admin/stats.tpl
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>