Some speed-up fixes
Merge branch 'master' of https://github.com/almalence/OpenCamera.git

Conflicts:
	src/com/almalence/opencam/MainScreen.java