preparing
Merge branch 'master' into downloadDepAction

Conflicts:
	resources/META-INF/plugin.xml
implement download action
changed icons