reverted fix of warnings related to JDK 1.7
incremented build number
Merge branch 'master' into deploy