Lists design
Home page design
Add zoom/pan control
Merge remote-tracking branch 'origin/working_fix_keys'

Conflicts:
	gen/fr/utbm/calibrationapp/R.java
	res/layout/activity_welcome.xml
	res/values/color.xml
Merge remote-tracking branch 'origin/master' into working_gui