Rename files ControlPicture to ControlPictureActivity and change dir
erge branch 'master' of github.com:Pyarg/androidSchoolProject