Food for searching updated.
Setting of profile weight back at the end of test added.
AddExerciseUsingFitbit test added
Merge branch 'master' of local repository into stage2

Conflicts:
	mfp-qa/src/test/java/com/myfitnesspal/qa/test/acceptance/FoodSearchTest.java