Add conflict handling into demo
Fix iPad selection bug
Remove Purge, Cleanup Code
Merge pull request #2 from phvannor/master

Add conflict handling into demo