admin update
data section update
Merge branch 'master' of github.com:magnuskiro/master