Update
Merge branch 'master' of github.com:ychubachi/framework_development

Conflicts:
	slides/framework_development.org