Added new settings and fixed errors of registration
Merge branch 'master' of https://github.com/gestorpsi/gestorpsi