Simple web project working.
Merge remote-tracking branch 'origin/master'

Conflicts:
	BigDataCourse/webapp/.classpath