Fixed bugs which aren't merged successfully.
Merge branch 'master' of github.com:hiroki5/SADP-android