updating gen-idea
issue #4
issue #4
issue #4
Merge branch 'master' into sonatype

Conflicts:
	project/plugins.sbt