Merge pull request #124 from alex-zen/master

Implemented delete of content in authoring.
Integration Fixes - TODOs, Default Timeline, Code Review
Merge pull request #125 from javierluraschi/Sprint3IntegrationFixes

Integration Fixes - TODOs, Default Timeline, Code Review
merged with latest version of blessed