Jump through hoops to get JUnit 4.11 to work

	Change the JUnit 3 whatever dependency to JUnit 4. This is probably
extremely inadvisable to do. Someone should ask Peter B about this prior
to merging this into master. Also remove a bunch of @Override
annotations that Eclipse thinks aren't valid.
Fixed bug related to incrementing the Stop Recording year by 50.
Ugly hack to fix issue 12

  Make the sample panel select an index upon loading a file. This causes
sample panel to redraw.
Made a ton of refactoring changes to the code, more to come.
Merge branch 'master' of https://github.com/purpleplatypus/FHAES

Conflicts:
	FHRecorder/src/main/java/org/fhaes/FHRecorder/EventPanel.java
Fix some renames that got missed
Revert "Jump through hoops to get JUnit 4.11 to work"

This reverts commit 57a5ec2ef2c73078f076cf9f41d5bada547ebf24.
Refactoring

	Extract method from importFile(). The function is too long and does
most of its work on the data for another object.
Further refactoring of Controller

  Use extract method and add some comments.
Add some comments

  Awww yeah, comments.
Merge pull request #20 from purpleplatypus/issue_12

Issue 12
Move loadFileMetaData() into FHX2FileOptional

  Since loadFileMetaData seems to be exclusively operating on data that
belongs to FHX2FileOptional, it seemed more appropriate to move that
function there.
Move readSamplesFromFile() to FHX2FileRequired

  This seemed like a good idea from an encapsulation standpoint. All of 
the loading stuff is done on data in FHX2FileRequired. This doesn't
appear to have broken anything, amazingly.
Remove some commented out code
Extract and move saveFileMetadata() to FHX2FileOptional

  It seemed prudent to extract and move this since the operation is on
the data in the class. These changes seem to not break anything, except
for that one time when it crashed when loading a file. I can't replicate
this bug, and we don't have unit tests...
Merge remote-tracking branch 'origin/master' into refactored
Merge pull request #21 from purpleplatypus/refactored

Refactored
Fixed issue10, just need to test a little bit more
Sample years now skip year 0, but not event years yet
Event years now skip year 0