Merge branch 'content'
New Database with bug fixes
Merge branch 'master' of https://github.com/smittex/mobileapp