Merge pull request #1 from phvannor/master

Add offline SDK to sample, commit framework file as well
Only update locally when returning
Add conflict handling into demo