Fixed validation of allowed bbcodes
Merge branch '2.0'