Merge branch 'feature/Swiftcore_DevToolbar' into develop
Merge branch 'feature/Instruction' into develop
ignore media/catalog/ folder