dfasugpoiadfhg[oiahfg[vhiadfo
Merge branch 'master' of https://github.com/adrianbarton/seratron

Conflicts:
	web/content/component/register/register.php
	web/content/js/register/checkUsername.js