re #639 - Always show the email address when set
re #639 - Removed unused fields in com:contacts
re #639 - Added template override for com:categories to reduce code
re #639 - Make sure the template overrides stay when Nooku is being updated
Merge branch 'refs/heads/feature/639-overrides'