Merge remote-tracking branch 'origin/master'

Conflicts:
	src/pl/byd/promand/Team1/SurfaceViewDraw.java