Ensured that FolderStore updates a folder's items when the item is updated/created
Merge branch 'master' of github.com:bedatadriven/activityinfo
Cleaning up unit test failures
Merge branch 'master' of github.com:bedatadriven/activityinfo