Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user

.gitignore

@@ -1,36 +1,40 @@
-.htaccess
-.htaccessbak
-bin
-/nbproject/
-/vendor/*
-!/vendor/FHC-vendor
-/.idea/
 documents/
+vendor/
+
+/nbproject/
+/.idea/
 .settings
 .project
 .buildpath
+.ptp-sync*
+
+.htaccess
+.htaccessbak
+
 application/config/development/
-application/config/testing/
-application/config/production
-application/extensions/
-application/controllers/extensions/
 application/config/extensions/
+application/config/production
+application/config/testing/
+application/controllers/extensions/
+application/extensions/
 application/helpers/extensions/
 application/hooks/extensions/
 application/libraries/extensions/
+application/logs/
 application/models/extensions/
 application/views/extensions/
 application/widgets/extensions/
-application/logs/
+
 public/extensions/
+
 tests/codeception/_output/*
 !/tests/codeception/_output/.placeholder
 tests/codeception/codeception.yml
+tests/codeception/tests/acceptance.suite.yml
 tests/codeception/tests/api.suite.yml
 tests/codeception/tests/functional.suite.yml
-tests/codeception/tests/acceptance.suite.yml
 tests/codeception/tests/unit.suite.yml
+
 /sparks/*
 /webdav/google.php
 system/sql/
-.ptp-sync*