v1.0 beta init
conf-default
Merge branch 'develop-v1.0'