changes in guest user
Merge branch 'development'