Fixed register function
Merge branch 'feature-shopPage' into develop