openid

Merge branch 'openid' into oe
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
merging master in

Merge branch 'master' into oe
small changes to new service instagram to conform to new interface api
small changes
a few more things i forgot to commit
 a few more things for weather app
Merge branch 'master' into openid