Merge pull request #132 from ros-controls/fix_cmakelist_catkin

Fixed incorrect ordering of catkin_package() call that breaks catkin 2.0
Buildsystem fixes suggested by catkin_lint
Merge pull request #133 from pal-robotics/catkin-lint-fixes

Buildsystem fixes suggested by catkin_lint
Merge branch 'indigo-devel' into indigo_to_groovy_backport