Updated description
Merge pull request #3 from OSUrobotics/master

Made this change on the wrong branch
Removed test function

Maybe move it into a real test eventually
Updates for ros-interactive-manipulation/pr2_object_manipulation#55
readded pick and place demos dep
updated args and added new param
added arg for flip
Merge branch 'optimize' of github.com:OSUrobotics/ros-3d-interaction into optimize

Conflicts:
	projector_interface/launch/calibrate_and_circle.launch
fixes for study (click stats)