FatSecret API working
Merge branch 'master' into previous-state

Had to revert to a previous commit, and start from there.
stash commit
merging