stashed changes
Added missing changes
Revert "stashed changes"

This reverts commit e2b0a2b098b970969467a738565331a5cab90f72.
Revert "Added missing changes"

This reverts commit d42bb35535ebf8a5820db25a95533dc3a8159335.
Added resolveConflictView
Added unittest for resolveConflictViewModel
Added basic comparison to conflict view
Highlight conflicting rows
hide id field from conflicts
hide Etag field from conflicts
Improved resolveConflictViewModelTest structure
Begin story ids at 1
Switched from callbacks to events
implemented TakeOriginal for conflict resolving
Added button to view to keep server version
implemented TakeRequested for conflict resolving
moved success notification on update to service
Merge remote-tracking branch 'origin/master' into OfflineMode