Merge pull request #2 from SimpleMachines/release-2.1

Reverse PR
BBC Enable/disable & post collapse going post settings
Signed-off-by: Antes <antes@simplemachines.org>
Merge pull request #1525 from Antes/theme-settings

BBC on posts & collapse thing to post settings