tried and failed web services
Merge branch 'master' of https://github.com/spothire/HealthNut

Conflicts:
	bin/HealthNut.apk
	bin/classes.dex
	bin/resources.ap_
	gen/.gitignore
	src/DBLayout/SqlLiteController.java
	src/add/AddExercise.java
	src/add/AddFood.java
	src/add/Today.java
	src/analyze/Analyze.java
	src/analyze/appCalendar.java
	src/com/example/healthnut/NFC.java
	src/com/example/support/Exercise.java