v1.2.1-142: Merge remote-tracking branch 'origin/intellij14.1' into intellij15

# Conflicts:
#	gradle.properties
#	src/main/java/com/urswolfer/intellij/plugin/gerrit/git/GerritGitUtil.java