Upgraded to JUnit 4.11, IDEA 12
chmod 644
Merge branch 'master' into beyond
chmod 644