no message
Merge branch 'master' of https://github.com/nimanym/fliquer

Conflicts:
	register.php
no message
Merge branch 'master' of https://github.com/nimanym/fliquer