Fixed jre 1.5 issues
Merge branch 'master' of ssh://github.com/shumash/db_project