add atlassian ide connector to gitignore
Merge branch 'master' of github.com:Astonex/Antox

Conflicts:
	.gitignore
Updated Dutch translations
Merge branch 'dutch-translations' of https://github.com/hoshsadiq/Antox into hoshsadiq-dutch-translations
Merge branch 'hoshsadiq-dutch-translations'