0.7.4: fix R.java generation with gen-idea
Merge branch 'master' into sbt-0.11