please work jebus
crap
Merge branch 'master' of github.com:reyner/mashup
FB Login redone - older version
merge fixed