Merge pull request #2 from johnmannpaul/2013-14-Data-Model

2013 14 data model
tidied up db connectivity
Merge pull request #3 from johnmannpaul/master

Need to sync db connectivity changes