Merge branch 'hotfix/question'
Merge branch 'hotfix/question'
Added alert window on submiting email.
Merge branch 'hotfix/better_ui' into develop