mahout
removed web legacy code
merge solving
work on thesis
more work on thesis
Merge branch 'master' into clusteringwork

Conflicts:
	lib/mahout-integration-0.9.jar