Changed to Java 1.7
Merge branch 'naf' of github.com:ziorufus/kaflib into naf