init commit
init dev-master
full clear
Merge branch 'dev-master' into gh-pages