Added HSQLDB
Merge origin/master and fixing image in GUI