Updated dependancies
feature-bb-code-update merged into master; resolves #5