localstorage bug fixed
Merge branch 'bug/localstorage'
form fixed
Merge branch 'bug/update-form-fix'
matching algorithm for lifestyle and date type complete
final algorithm
merged conflicts & fixed algorithm