One cache file per user implemented

Few example app changes
More unit testing
Merge remote-tracking branch 'origin/master'