Graph
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	ISEdesign/Actionbar.cs
	ISEdesign/MarketView.cs