Changed to compile with Java 1.6
Merge branch 'dev'
Updated .gitignore for JBDS 8.