Threads extended
Merge branch 'master' of https://github.com/SE610TEAMB/ARSV2

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/ARS/.indexes/0/fc/42/f0/9b/b2/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/ARS/.indexes/0/fc/42/f0/9b/b2/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/ARS/.indexes/ed/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/ARS/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/ARS/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Plugin_Resources/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Plugin_Resources/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2014/11/48/refactorings.history
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2014/11/48/refactorings.index
	ARS/diagrams/Systems/ARS/AGV/ARR_Ground/implementation/bf5ce6e9-11b2-4ed2-b77d-4733da07b645.aadl_diagram