Merge branch 'master' of github.com:yhbrandon/nexa

Conflicts:
	content/02-services/03-trade-analytics-services/trade-analytics-services.txt