oaeu≈
Merge branch 'master' of http://github.com/CommonAccord/commonaccord

Conflicts:
	Doc/core/id/solomon_shirley