fixed database entry duplication issue, refactored database to include FTS and standard SQL tables, also updated search to include matching on abbreviations (Issue #19)
resolved merge conflict in project.properties file; simple discrepencies regarding reference library pathes