Refactored new graphic methods

Covered with unit tests
KalibroEntites updated to rc6

Signed-off By: Fellipe Souto <fllsouto@gmail.com>
Signed-off By: Renan Fichberg <rfichberg@gmail.com>