splash et ui
Merge branch 'master' of https://github.com/KiGniark/TradeAndGo

Conflicts:
	.idea/misc.xml