Add stxxl
Merge remote-tracking branch 'origin/master' into stxxl

Conflicts:
	.gitmodules
Merge pull request #25 from ethz-asl/stxxl

Add stxxl