added reset key migration
Merge branch 'dev'
added reset key migration to master