init
eclipse
+ krdc
+screen
Merge remote-tracking branch 'origin/master'

Conflicts:
	adm/installers/install1404.sh