Finish sample app
Fix Merge Issues