Merge pull request #299 from tyrcho/master

better display and sorting of decks
Extra opponent name tests

Added more opponent names for OCR tests (thanks #297 and #300)
Reinstated Ant for Mac OS X build

I haven't been able to get the Maven build working for OS X so I've reinstated the old Ant build — it's the same build script as before, with only the folder locations changed to match the new Maven locations.
Reverted to official Rococoa 0.5 release for Mac OS X build

The Rococoa 0.5 jar file on Maven Central seems to be corrupt, or at least is quite different to the official release from https://code.google.com/p/rococoa/ — and it doesn't work. I've removed the dependency from the Maven pom and checked in the official release.
DRY
Further fixes to the Maven build for OS X

* Checked in the official release of rococoa 0.5 because the Maven one seems broken
* Checked in the previous release of JAI ImageIO because the Maven one is missing binaries
* Configured Maven to use the provided libraries instead of libraries from Maven Central
* Updated the Ant build to use those libraries
Moved uploader into dedicated Maven module

This is the first step in splitting the build into three Maven modules, one for the main uploader app and two for the platform-specific code (ie a Windows modules and an OS X module).
The two dependencies that we need which aren't in Maven have been moved into a local repository in /lib
Split into three Maven modules

The Maven build is now working, and should be ready to replace the Ant build. The Maven build consists of three modules:
* uploader: the core of the program that includes the UI and analysis code
* uploader-osx: the Mac OS X-specific code and the .app bundler
* uploader-win: the Windows-specific code and the .exe bundler
Added missing OS X tesseract training data

The OS X build doesn't use the training data in the .jar file so it needs its own copy of the data, which was missing.
Merge pull request #310 from HearthStats/maven-build

Maven Build
Build improvements for Windows

* Restored the icon to the Windows executable
* Set memory limits on the Windows executable
* Configured OS X build to delete bundle before rebuild, otherwise building the OS X bundle on Windows fails
Merge branch 'master' into deck_overlay

Conflicts:
	pom.xml
	uploader/src/main/java/net/hearthstats/DeckSlotUtils.java