Commit before pull
Merge branch 'master' of https://github.com/DeepBlue14/ros-integrator

Conflicts:
	nbproject/private/private.xml
Merge branch 'master' of https://github.com/DeepBlue14/ros-integrator

Conflicts:
	nbproject/private/private.xml
Fixed bugs