Register Added
Merge branch 'dev' into feature-register