settings diet upgrade
Merge branch 'master' of https://github.com/UTASoftwareEngineering2014/HealthNow

Conflicts:
	src/com/application/healthnow/diet/PreferencesActivity.java