Merge pull request #1 from stckcrsh/master

Updated SQLite with location
added maps into merged project
Merge pull request #2 from llavin/master

Maps Integration
Merge pull request #1 from G0ldf1sh137/master

Matching up with lauren and matt