Merge branch 'master' into maven

Conflicts:
	src/main/java/net/hearthstats/Updater.java
Merge branch 'master' of https://github.com/Hearthstats/HearthStats.net-Uploader

Conflicts:
	src/main/java/net/hearthstats/Updater.java
Merge remote-tracking branch 'remotes/origin/master'
better display and sorting of decks
Merge pull request #299 from tyrcho/master

better display and sorting of decks