Merge branch 'manage-deals' into develop
Fixed missing commas
Merge branch 'develop' into manage-deals
Some minor fixies and improvements