Merge pull request #17 from Traction-Creative-Services/master

pulling newest updates into models branch
Merge branch 'master' into models
merging update
Bug: task lists parsing meeting database fix
fixing author
Merge pull request #22 from Traction-Creative-Services/models

Pull newest updates and bugfix for task list query
Merge branch 'master' into development
fix logo
Merge pull request #23 from Traction-Creative-Services/development

Development