Some Bug fixes
Merge branch 'develop' of github.com:ndomar/megasoft-14 into bugfix
Merge pull request #407 from ndomar/bugfix

Bugfixes
Merge branch 'develop' of https://github.com/ndomar/megasoft-14 into c4_KareemWahby_#56_ForgotPassword
Issue #400 - Add changes to backend