Merge branch 'release/v1.5.4' into production

Author: Antonio

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Log entries**
+Please add any logged error or warning here or as an attachment
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -48,6 +48,9 @@ hybris/bin/custom/deploymentScriptsManager_*.zip
 #Intellij IDEA
 .idea/workspace.xml
 .idea/tasks.xml
+.idea/usage.statistics.xml
+.idea/shelf
+.idea/libraries
 
 #Reports of PMD, Checkstyle and Findbugs
 qa_reports/
@@ -60,10 +63,16 @@ qa/pmd-bin*
 qa/checkstyle-*
 !qa/checkstyle-simple.xsl
 
-qa/cobertura-*
+qa/jacoco-*
 
 velocity.log
 qa/cobertura.zip
 
 **.bak
 *-testclasses.xml
+integration_tests_with_ant/docker-volumes/
+.idea/dataSources/
+.idea/consolestorage/
+.idea/sonarlint/
+.idea/dataSources*
+.idea/ant.xml