added dbfilter, js, and updated arcdb
Updated include path
Corrected Conflicts