NAS-2124 Switch to slf4j as logging framework: tra continuing nicl work.
FileAsserts now uses junit 4 + hamcrest matchers.
NAS-2374: Added java_home to windows start script generation and also converted it into some less constant hellish.
Merge branch 'NICL' into NAS-2124

Conflicts:
	README.txt
NAS-2374: Added StdErr output to windows start script.
Merge branch 'master' into NAS-2374

Conflicts:
	deploy/deploy/src/main/java/dk/netarkivet/deploy/WindowsMachine.java
NAS-2374: Forgot a critical line in the WindowsMachine start app script.
Updated JWAT dependency from 0.9.1 to 1.0.1.
NAS-2381 Enabling javadoc generation with doclint check disabled.
Reformatted pom.xml's, added source generation to a more quiet javadoc.
Reformatted Java sources according to build-tools/ preference file.
Organized imports with Eclipse.
NAS-2353 Formatted all java and pom files with IntelliJ
NAS-2353 Adding IntelliJ code style definition
Reformatted with Eclipse settings again.
Merge branch 'REFORMAT' of github.com:netarchivesuite/netarchivesuite into REFORMAT
NAS-2353 Manually tuned archive-test formatting
Java sources and pom.xml files reformatted.
Updated README.txt for new formatting.
H1: Moving classes that run in Heritrix1 to separat module.