update new feature
new file
add admin and update new feature
new file
Merge branch 'octopus'

working on admin