Added humanoid / Nao stack back for electric
Removed double octomap_mapping entry in doc, now in its own rosinstall
Merge pull request #365 from ahornung/master

alufr-ros-pkg fixes for doc (electric / fuerte)