resolves conflicts in base settings
Initial commit of the testimonials app
Merge branch 'develop' of github.com:bunchesofdonald/owc into develop