some merge from IntelliJ IDEA Community Edition:
 - remote servers
 - run configurations
next merge