rosmatlab: source setup.sh in matlab start script if ROS_PACKAGE_PATH is not set
Merge branch 'master' into indigo-devel