Remove unnecessary conversion
Aggregate link/annotate modules to ensure SBT clean works correctly
Make i18n field prefix for various types match the entity type.

This makes it more consistent and makes it possible to infer the prefix.
Prefix field with item type (fixes #247)
Merge branch 'master' into merge_guides

Conflicts:
	project/Build.scala