##479 All Fixed
Merge branch 'master' of https://github.com/alaashafaee/Coolsoft-14 into C4_Mussab_Fix_DragNDrop_Editor_Zooming_issues
#479 fix indentation
#479 fix indentation
#480 Fix master conflicts and add more styling
Merge pull request #480 from alaashafaee/C4_Mussab_Fix_DragNDrop_Editor_Zooming_issues

Pull Request: C4_Mussab_Fix_DragNDrop_Editor_Zooming_issues