Merge pull request #3 from johnmannpaul/master

Need to sync db connectivity changes
Merge pull request #4 from johnmannpaul/2013-14-Data-Model

Merge pull request #3 from johnmannpaul/master