Merge branch 'dev1'
slider bug
Registration 0.0.2
-
-