Merge pull request #9 from mlosch/master

Fused color and object recognition.
outsourcing shape classification to class