Updating something
Merge remote branch 'origin/wiki_scanner'
Fixing bug
Merge remote branch 'origin/wiki_scanner'
Merge remote branch 'origin/socialcoffee'
Merge remote branch 'origin/socialcoffee'
Merge remote branch 'origin/socialcoffee'
Merge remote branch 'origin/socialcoffee'
Merge remote branch 'origin/socialcoffee'
Merge remote branch 'origin/socialcoffee'
Merge remote branch 'origin/socialcoffee'
Fixing problem
WIll change this later
fixing bugs
Everything is on the place
Merge remote-tracking branch 'origin/master' into socialcoffee

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