Adding trapezoid shape service
Merge branch 'master' of https://github.com/danielpacak/apache-felix-tutorial