watf
Merge branch 'master' of
https://github.com/Rivenation/SteamMarketWatcher

Conflicts:
	bin/com/herggu/steammarketwatcher/SettingsManager.class