docs
Merge branch 'master' of github.com:stellar/api-docs

Conflicts:
	commands/transactions.xml