Remove unneeded imports in datacontroller (OgttSerie error)
Using the nrc-oauth-plugin instead of the (deprecated) fitbit4j API client
Performance improvements for Medisana, Fatsecret and merged fields (like Daily steps -> steps)
Merge branch 'master' of https://github.com/TNO/NRC into p4

Conflicts:
	local-plugins/data/nrc-data-fatsecret/grails-app/controllers/nl/tno/nrc/plugins/data/fatsecret/FatsecretController.groovy