Merge branch 'johannes' into 'master'

Johannes: modif  of  cmake configuration to be able to compile on Ubuntu 14.04

modif  of  cmake configuration to be able to compile on Ubuntu 14.04

See merge request !6