tt
Merge origin/master

Conflicts:
	TradingTerminal/web/index.html
Merge origin/master

Conflicts:
	TradingTerminal/web/index.html