update registration
update permision
Merge branch 'master' into project