fixed demo and TP
Merge branch '20140407_Sprint_7' of https://github.com/Film-Skills/wolaslite-client into 20140407_Sprint_7