Merge pull request #17 from tpokorra/master

Merge updates from lp:openpetraorg.
up until https://bazaar.launchpad.net/~openpetracore/openpetraorg/trunkhosted/revision/2788