made some changes
Merge branch 'master' of https://github.com/jimadams25/FluidFitness

Conflicts:

FluidFitness/src/com/android/fluidfitness/activities/ExerciseDetails.jav
a
	FluidFitness/src/com/android/fluidfitness/activities/ExerciseList.java

FluidFitness/src/com/android/fluidfitness/adapters/ExerciseParameterAdap
ter.java