Merge tag '1.1' into develop

1.1
icon added
Auto Hide options for edit mode and view mode
Icon added