Moved window icon code to main class
Merge branch 'master' of https://github.com/bitsquare/bitsquare
Use "-" instead of "_" in app name when application arguments are used (Bitsquare-Alice) as Akka does not allow "_" in AkkaSystem names.