Settings page flow with back button
Merge pull request #128 from usersource/feature/Settings_page_flow_with_back_button

Feature/settings page flow with back button