progress commit
progress commit
Merge branch '20140407_Sprint_7' of https://github.com/Film-Skills/wolaslite-client into 20140407_Sprint_7
minor changes
Merge branch '20140407_Sprint_7' of https://github.com/Film-Skills/wolaslite-client into 20140407_Sprint_7