pluginiser
Merge branch 'master' of github.com:abelass/joergschumann

Conflicts:
	.gitignore
	.project