Theme Builder

Hello,

we have just installed Confluence 3.1-beta in our development environment and noticed a few things not working in theme builder, version 3.4.0-M4-conf3. For example, results in exception:
Unable to render content due to system error: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'com.adaptavist.confluence.builder.macros.LogoMacro': Instantiation of bean failed; nested exception is java.lang.NoClassDefFoundError: com/atlassian/confluence/util/ResourceManager

ResourceManager class has been deprecated in 3.0.2 and removed in 3.1.

Thanks,

Michael