Merge remote-tracking branch 'origin/develop' into develop
Ignore conflict files
Removed unnecessary files