FB - Database (Part 2)
Merge branch 'master' of https://github.com/leowns/spotted