fixes the bug
isScreenLocked fix
Merge remote-tracking branch 'origin/master' into
P11.18_new_img_camera_wo_sdcard

Conflicts:
	PaintroidTest/src/org/catrobat/paintroid/test/integration/BaseIntegrationTestClass.java
Merge pull request #125 from Catrobat/P11.18_new_img_camera_wo_sdcard

P11.18 new img camera wo sdcard
Implementation: @landliebe [ML]
Accpentance: @galstc05 [SG]