Upgraded to JUnit 4.11, IDEA 12
Merge branch 'master' into tutorial