Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Implementing feature #36, added db module for db configuration
Merge branch 'feature-36' into develop