Beginning conversion to freemarker templates. /engine updated
Finishing /engine and /engine/job/{job}
Removing old commented out code
Scripts and Beans converted to freemarker
Removed temporary template loading from file system
Removed temporary template loading from file system.
Removed unused method: getAvailableActions
Removed commented out code.
Converted data models to be usable for conversion to HTML and XML. Updated Models and freemarker templates to match XML naming
Fixed bad merge conflict
BeanBrowseResource.java
	Removing obsolete method: makePresentableMap()
JobResource.java
	Removing temporary template loading. Finishing converting XML and HTML generation to use the same data model
CrawlJobModel.java
	Converting to same Map based reports used by XML API
EngineModel.java
	Converting to same Map based reports used by XML API
Engine.ftl
	Creating template for Map based reports
Job.ftl
	Creating template for Map based reports
EngineResource.java
	Pulling individual values for necessary data from crawl jobs instead of building the full CrawlJobModel
CrawlJobModel.java
	Moving some data from methods into fields so they are exposed in the XML representation
EngineModel.java
	Removing full building of CrawlJobModel. Handling instead in EngineResource
Job.ftl
	Updating fields that relied on CrawlJobModel methods which were moved to fields.
CrawlJobModel.java
	Adding check for application context
Beans.ftl
	Fixed a bug that showed objects with no properties as null instead of displaying the class name
Job.ftl
	Fixed a bug that prevented the configuration referenced paths from displaying
Script.ftl
	Fixed a bug that rendered extra whitespace before and after the script block
add test for handling of bad http headers (to make sure we don't break this when we get rid of archive-overlay)
Merge branch 'master' of github.com:internetarchive/heritrix3
Dependency Fixing: Added LaxHttpParser which can be used explicitly when using the lax header parsing functionality.
Added HttpParser which just extends LaxHttpParser in the original httpclient package to avoid breaking compatibility with code
which may still reference HttpParser.
Explicit commons code changed to use LaxHttpParser in arc/warc record reading
put .settings in .gitignore after all
put .settings in .gitignore after all
Merge branch 'master' into freemarker

Conflicts:
	.classpath