removed submodule plugins (core is not dependent on it)
Merge branch 'develop' into feature/extract_plugins

Conflicts:
	plugins
resolved
Merge branch 'hotfix/maven_deploy_plugin'
Merge branch 'master' into feature/extract_plugins

Conflicts:
	pom.xml
solved
Merge branch 'develop' into feature/extract_plugins

Conflicts:
	plugins
	pom.xml
Resolved