Copyright updated.
Merge remote-tracking branch 'origin/master'
IDEA-100175 Groovy 2.1: bad code is green: annotation attribute declared in annotation and in alias, highlight classes annotated with @AnnotationCollector as annotations
IDEA-101607 Groovy: incorrect resolve of array access invoked on methodCall
Add serialVersionUID for MavenPlugin class
Delete tree file if it's broken.
IDEA-76245 Mercurial: NPE for UpdateTo and Merge actions without valid hg executable specified

*Handle errors  before execute.
*Do not update branches in dialogs if they are null for this repo.
Improve notification on old-style JVM proxy settings
for IDEA-101124 Mac: Error Message "You have JVM property https.proxyHost set..."
Merge remote branch 'origin/master'