Merge branch 'mock-data' into thin-client
Merging thin-client.
First Jasmine test.