fix composer.json master dependency
removed orphan files and edited bbcode for decoda
Merge remote-tracking branch 'refs/remotes/origin/master' into 2.1