Sync main activity code with server side changes.
Merge pull request #26 from yanivgal/SyncCodeWithServerSideChanges

Sync main activity code with server side changes.