Commit of friday
Merge remote-tracking branch 'upstream1/master'

Conflicts:
	Clustering/.classpath
09-05
12-5
Merge remote-tracking branch 'volvo/master'
AMOS II interface.
Merge pull request #6 from kdop/master

AMOS II Connectivity