TSP-4673 Last-minute changes for the demo
TSP-4673-demo: processed code review
Merge pull request #23 from ticketscript/TSP-4673-demo

TSP-4673 Last-minute changes for the demo