IntelliJ IDEA 14.0.2 <csaba@sabayon Update ide.general.xml
IntelliJ IDEA 14.0.2 <csaba@sabayon Update other.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/ide.general.xml