2-92 completed DUAL
Merge branch 'master' of https://github.com/development-team/2

Conflicts:
	doc/analysis/cognitive_architecture.md