# Conflicts:
#	forena.module

Issue #2615030 by alieffring: Forena's drupal_date_format only supports built-in formats "small","medium" and "large"

Fixed bug in some classnames.

# Conflicts:
#	Frx.inc
#	FrxContext.inc
#	FrxDrupalApplication.inc
#	FrxReportGenerator.inc
#	FrxSQLQueryBuilder.inc
#	builders/FrxQueryBuilder.inc
#	data/drupal/settings.php
#	data/sample/settings.php
#	feeds/FeedsForenaBlockFetcher.inc
#	forena.admin.inc
#	forena.common.inc
#	forena.data.inc
#	forena.info
#	forena.module
#	forena.report.inc
#	forena.test
#	forena_pdf.module
#	forena_query.inc
#	forena_query.module
#	reports/custom_skin.skinfo
#	reports/default_skin.skinfo
#	reports/help/data.frx
#	reports/help/forena_hooks.frx
#	reports/help/reportingfrx.frx
#	reports/help/skins.frx
#	repos/drupal/roles.sql
#	src/Context/DataContext.php
#	src/DataManager.php
#	src/DocumentType/CSVDocument.php
#	src/DocumentType/DocumentTypeBase.php
#	src/DocumentType/DrupalPage.php
#	src/DocumentType/EmailMerge.php
#	src/DocumentType/ExcelDocument.php
#	src/DocumentType/HTMLDocument.php
#	src/DocumentType/MPDFDocument.php
#	src/DocumentType/PrincePDF.php
#	src/DocumentType/SVGDocument.php
#	src/DocumentType/WordDocument.php
#	src/DocumentType/XMLDocument.php
#	src/Driver/FrxDataSource.php
#	src/Editor/ReportEditor.php
#	src/File/DataFile.php
#	src/File/FileBase.php
#	src/Renderer/FrxCrosstab.php
#	src/Renderer/FrxEmailMerge.php
#	src/Renderer/FrxFieldTable.php
#	src/Renderer/FrxInclude.php
#	src/Renderer/FrxMergeDocument.php
#	src/Renderer/FrxMyReports.php
#	src/Renderer/FrxParameterForm.php
#	src/Renderer/FrxSection.php
#	src/Renderer/FrxSource.php
#	src/Renderer/FrxTable.php
#	src/Renderer/FrxTitle.php
#	src/Renderer/FrxXML.php
#	src/Renderer/RendererBase.php
#	src/Report.php
#	src/ReportFields.php
#	src/Skin.php
#	src/Token/TokenReplacerBase.php