Things I updated at 15:05 Nov.30th.2014 that should be imported
Merge remote-tracking branch 'origin/master'

Conflicts:
	CabShare/.classpath