added calculation method for nutrient
Merge branch 'master' of https://github.com/thomt/Innutrac

Conflicts:
	bin/Innutrac.apk
	bin/classes.dex
	bin/classes/com/innutrac/poly/innutrac/UserInfoActivity$4.class
	bin/classes/com/innutrac/poly/innutrac/UserInfoActivity.class
	bin/resources.ap_
merge fix
add new day
implented new db and got new day to work