-- added switch for cmake file to choose between eigen and gsl
Merge branch 'master' of https://github.com/stefanmay/obviously into christian_stable

Conflicts:
	obcore/CMakeLists.txt
Merge pull request #16 from stefanmay/christian_stable

merged