sidebar- register
Merge origin/master