moved root of the project to the manage folder (no need for the manage folder)
Merge remote-tracking branch 'origin/DEV'