Merge pull request #83 from COPPER-BOBCAT/staging

DB merge fix
fixed selece
Merge pull request #84 from zindlerb/master

fixed highlight bug