fix latest issues
Merge branch 'master' of ssh://gitlab.badrit.com:2200/mahmoud.khaled/redmine_scrummer
Merged with Hesham changes
Merge branch 'master' of https://github.com/BadrIT/redmine_scrummer