(fix) errors when excel table import
Merge remote-tracking branch 'origin/wed_for_pdf' into wed_for_pdf

Conflicts:
	app/src/main/assets/rating_table.xls
	app/src/main/java/com/mil/physicaltraining/Exercise/Exercise.java
	app/src/main/java/com/mil/physicaltraining/Workspace.java