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