iPhone app. Macronutrients screen update, divide into 2 classes and several bug fixes.