removed java7 api usage
target bytecode level 1.6
updated version
added new todo
Merge branch 'master' into backport_intellij_11

Conflicts:
	.idea/compiler.xml
merged
Merge remote-tracking branch 'origin/backport_intellij_10' into backport_intellij_11