Merge pull request #1 from catkin/master

Pulling in changes from catkin
Merge pull request #2 from ethz-asl/fix/install-include

Fix/install include
Added automatic installation of roslaunch files with cs_install() macro if a launch folder exists in the source directory
cs_install() installs shared content folders
* launch, rviz, urdf, meshes, maps, worlds, media and param
Add informative cs_install() cmake output.
Merge branch 'feature/install_roslaunch_files' of https://github.com/ethz-asl/catkin_simple into ethz-asl-feature/install_roslaunch_files
[style] remove trailing whitespace
only install Media, not media, automatically