Add optional extensions dependency
Merge branch 'master' into feature/thrift

Conflicts:
	src/bin/hyrise/Makefile