Added zoom gesture
Merge branch 'master' of https://github.com/Guigeek03/CalibrationApp.git

Conflicts:
	gen/utbm/project/calibrationapp/R.java
	res/layout/activity_calibration.xml
	res/layout/activity_main.xml
	res/values/strings.xml
	src/utbm/project/calibrationapp/Calibration.java