Added moveit pkgs to documentation indexer
Fixed merge conflict
Merge pull request #1256 from davetcoleman/master

Added moveit pkgs to documentation indexer