(merge)
Merge branch 'master' of github.com:imhatep/physical_training

Conflicts:
	app/src/main/java/com/mil/physicaltraining/ExerciseActivity.java