Removed loadEntity from IDataMapper, added ability to escape tags in templates