Merge branch 'streaming', remote-tracking branch 'origin' into streaming
Merge branch 'streaming' of github.com:Foslock/JogNest into streaming
Security fixes. beginning FaceBook integration. FB int. only works on localhost. not on the server
Merge branch 'streaming'