new branch from yi
two button version
little changes
merge branch into master

Merge branch 'the_same_as_slide' of https://github.com/stnuessl/android