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