Added Calendar Button to return to calendar modified buttons
Tried User Service
Merge branch 'feature/artjplim' into develop