WIll change this later
fixing bugs
Merge remote-tracking branch 'origin/master' into socialcoffee

* origin/master:
  Everything is on the place
Whitespace/Tabs fix