Adding everything to the flow
Merge remote-tracking branch 'origin/master' into socialcoffee

* origin/master:
  Adding everything to the flow