FoodSearchTest fixed
ChangeWeightUnitsTest added.
ChangeWeightUnits test updated
Merge branch 'master' of local repository into stage2

Conflicts:
	mfp-qa/src/test/java/com/myfitnesspal/qa/test/acceptance/FoodSearchTest.java
Locators fixed for 'localization' release
Tests updated for localization release on rails3
Fitbit Calories header locator updated.