switched target to java 1.6
Merge branch 'master' of github.com:hltcoe/concrete
Merge branch 'master' of github.com:hltcoe/concrete
switched back to java 1.7