Adding nutrient-data app as dependency and unit tests
Merge pull request #1 from aarontimbo/master

Merge in master to develop, a bit backwards