change to not user usersettings for conversionrate
fixed servelet name bug
Merge branch 'dev' of https://github.com/liammaier/fitbitConnector into dev