o Merge from develop branch
o Fixed some merge problem with the FMDB submodule
o Added markers to the MBTilesDemo
Merge branch 'develop' into release
Merge branch 'develop' into release
Merge branch 'develop' into release
Merge branch 'develop' into release
Merge branch 'develop' into release
Merge branch 'develop' into release
Merge branch 'develop' into release
o Some Xcode 4.3 update
Merge branch 'develop' into release
Merge branch 'develop' into release
Merge branch 'develop' into release
Merge branch 'develop' into release
Merge branch 'develop' into release
Merge branch 'develop' into release
Merge branch 'develop' into release
Merge branch 'develop' into release
Merge branch 'develop' into release