Registration now working and login
Merge branch 'develop' of https://github.com/kutakitu/disp into develop