Added humanism, smartass and corporate tags in BBCode
Merge branch 'master' of https://github.com/discourse/discourse
Likes to lemons
Merge branch 'master' of https://github.com/discourse/discourse
Alpha tags in bbcode
Merge branch 'master' of https://github.com/discourse/discourse
Merge branch 'master' of https://github.com/discourse/discourse