fixed line endings
Merge remote-tracking branch 'origin/master'

Conflicts:
	ilastik/applets/connectedComponents/connected_comp.py
Merge remote-tracking branch 'origin/master'
added icon transparency and use transparent icons
Merge remote-tracking branch 'origin'