added reset stuff
Merge branch 'divie_front'
Merge branch 'requests'