refactor Monitor class : split into a CompanionFrame for UI stuff
refactor : clarify screen handling
unit tests for screen detection

versus_lobby is missing
Merge branch 'master' into friendly

Conflicts:
	uploader/src/main/java/net/hearthstats/Main.java
	uploader/src/main/java/net/hearthstats/ui/OptionsPanel.java
	uploader/src/main/scala/net/hearthstats/Monitor.scala
	uploader/src/main/scala/net/hearthstats/analysis/HearthstoneAnalyser.scala
implement pixel recogniton for the "friendly lobby" screen
fix match description
Conflicts:
	uploader/src/main/scala/net/hearthstats/HearthstoneMatch.scala
better error handling when deck is not visible
fix friendly match detection
fix screen config for friendly
fix tests which are actually "main"
Merge pull request #466 from HearthStats/friendly

Friendly Game Detection
Partial implementation of new config system

This is a working but not-yet-complete implementation of a new config system. It should be simpler, more reliable and make HearthStats Companion easier to unit test.
So far I've moved all the notification settings, window settings and monitoring method setting to the new configuration. Other settings remain in the old config system, and will be moved shortly.
another config implementation with less boiler-plate
add some explainations
Merge pull request #485 from gtch/config

Implementation of new config system
Merge pull request #487 from HearthStats/config

Config
Changed UTF-8 encoding to ISO-8859-1 for translation properties files because Java assumes that the files are in ISO-8859-1
Removed UTF8Control for handling UTF-8 properties files because all properties files are now ISO-8859-1
Completed migration to new config system

The old config.ini system is being retained in OldConfig for a little while to allow existing users to have their configuration migrated automatically. Once we think everyone has upgraded then we can removed OldConfig.
Merge pull request #489 from gtch/master

Completed migration to new config system