Added extra_context to get_containerbox template tag
Updated changelog with new templatetag feature
Fixed conflicts