Fixed a bug where a translated topics, topic was being overridden.
Made improvements to what data is eager/lazy loaded. Added more helper methods for getting the expansion string.
Merge branch 'master' into devel

Conflicts:
	rest-provider/pom.xml