Blubberblaa
Merge branch 'master' of https://github.com/MerkleB/WBTS

Conflicts:	MasterlyMate/app/models/topic.rb

-==Merged Single Parts of MM==-