Change compiler level to Java 1.7
Merge branch 'master' of https://github.com/ChiralBehaviors/scout.git