Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/unity

.gitignore

@@ -3,6 +3,7 @@
 /public/storage
 /storage/*.key
 /vendor
+**/.idea/
 .env
 .env.backup
 .phpunit.result.cache
@@ -11,6 +12,17 @@ Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
+composer.lock
+yarn.lock
+.DS_Store
+public/.DS_Store
+public/images/.DS_Store
+gox.iml
+rebuild_docker.sh
+docker/*
+db/*
+docker-compose.yml
+package-lock.json
 /public/admin
 /public/user
 /public/swagger