chaged gradle version and intelij to 13.1.5
Merge remote-tracking branch 'origin/master'