openid

Merge branch 'openid' into oe
fixed merge errror in fitbit harvester
indxjs
emax merge

Merge branch 'emax' into oe
merge oe

Merge branch 'oe' of github.com:sociam/indx into oe
latest greatest from dan

Merge branch 'openid' into oe
oe commit