bug fixed
Merge branch 'master' of github.com:krux02/AndroidLab2013