1.1

add some files
Merge branch 'dev'