IntelliJ IDEA 14.0 <csaba.patkos@csaba.dev.syneto.net Delete Deployment.xml, _.xml, Default for KDE copy.xml, Csaba.icls, Default _1_.xml, Csaba2.icls, Ruby_Rails.xml, Default.xml, Netbeans.icls, Mac OS X 10_5_ copy.xml
IntelliJ IDEA 14.0.1 <csaba.patkos@csaba.dev.syneto.net Update other.xml, colors.scheme.xml	Create _.xml, Default for KDE copy.xml, Default _1_.xml, Csaba2.icls, Mac OS X 10_5_ copy.xml, Deployment.xml, Csaba.icls, Netbeans 8.icls, Schuss.icls, Netbeans.icls, Default.xml, Ruby_Rails.xml, EasyEyesYellow.icls
IntelliJ IDEA 14.0.1 <csaba.patkos@csaba.dev.syneto.net Delete _.xml, Default for KDE copy.xml, Default _1_.xml, Csaba2.icls, Mac OS X 10_5_ copy.xml, Deployment.xml, Csaba.icls, Netbeans 8.icls, Default for XWin copy.xml, Schuss.icls, Netbeans.icls, Default.xml, Ruby_Rails.xml, EasyEyesYellow.icls
IntelliJ IDEA 14.0.1 <csaba.patkos@csaba.dev.syneto.net Update other.xml	Create _.xml, Default for KDE copy.xml, Default _1_.xml, Csaba2.icls, Mac OS X 10_5_ copy.xml, Deployment.xml, Csaba.icls, Netbeans 8.icls, Default for XWin copy.xml, Schuss.icls, Netbeans.icls, Default.xml, Ruby_Rails.xml, EasyEyesYellow.icls
Merge branch 'master'

Conflicts:
	$ROOT_CONFIG$/colors/EasyEyesYellow.icls
	$ROOT_CONFIG$/colors/Netbeans 8.icls
	$ROOT_CONFIG$/colors/Schuss.icls