merge
Merge branch 'master' of https://github.com/RudigerRoach/301_main_emma

Conflicts:
	Documentation/Bean-To-Code_SoftwareDocumentation.pdf
Merge branch 'master' of https://github.com/RudigerRoach/301_main_emma