Rebuilt jar for java 7
Merge remote-tracking branch 'origin/devel'