index.php
Merge branch 'master' of https://github.com/adrianbarton/seratron

Conflicts:
	web/content/index.php
sdfdfdfgds hg sdg
Merge branch 'master' of https://github.com/adrianbarton/seratron
component/register/checkUsername.php