IntelliJ IDEA 14.0.1 <csaba.patkos@Patkoss-Mac-mini.local Update other.xml, Csaba.icls, Default for XWin copy.xml, Csaba2.icls	Delete JavaScript.xml
Merge branch 'master'