user-area is protected
Merge branch 'user-area-proteced'
Merge branch 'master' into potato