Authored by Thomas Rasch

o Fixed some merge problem with the FMDB submodule

Subproject commit 5f14e7da23612c11b6e7016f0e44ba417626fbd3
... ...