Merge pull request #15 from raymondma1/testing

Testing
Fix map view
Merge pull request #16 from mochicat8/testing

Fix map view
Merge pull request #17 from SceneIt/staging

Fix map view
database connected