Added new ok and Wipe It buttons for Settings page
Merge branch 'master' of github.com:mikekvintus/aha