#2 Removed Reset, changed Buttons, fixed issue with appContext
Merge branch 'feature-sampleUpdates' into develop

* feature-sampleUpdates:
  #2 Removed Reset, changed Buttons, fixed issue with appContext