Reformatted with Eclipse settings again.
Merge branch 'REFORMAT' of github.com:netarchivesuite/netarchivesuite into REFORMAT