Merge branch 'develop' into lbudginas/#424_add_new_tab_on_account_page