Fix bug due to merge error

Change-Id: I7d9f9a838594bbab51e66d6d635adce4b849a8b2
Tests-fixtures renamed to tests-database and extended

Change-Id: If3e6e7b25c0345a00e3a1bd4cf1fa51e2b4b2cba
Reviewed-on: https://pirx.atteo.com/gerrit/147
Tested-by: Mr. Jenkins
Reviewed-by: Sławek Piotrowski <sentinel@atteo.com>
Intellij files added to .gitignore

Change-Id: Ifefceb41385bf5da83c72033d2a54c18998d7e84
Reviewed-on: https://pirx.atteo.com/gerrit/148
Tested-by: Mr. Jenkins
Reviewed-by: Sławek Piotrowski <sentinel@atteo.com>