nao_camera.py changes, uses camera_info_manager_py now
Merge pull request #6 from danielmaier/devel

nao_camera.py changes, uses camera_info_manager_py now
small bugfix in launch file
Merge pull request #7 from danielmaier/devel

small bugfix in nao_camera.launch
Merge ahornung's remote devel into local devel

Conflicts:
	nao_driver/manifest.xml