update route resetting mail
update fileStore
update doc
add city in register
update register parameter city
channel_show allow id & slug
Merge branch 'master' into develop