IntelliJ IDEA 14.0 <csaba.patkos@csaba.dev.syneto.net Update other.xml
Merge branch 'master'