Merge pull request #1 from upiq/master

PloneHotfix Compatibility and 0.9 release
Merge pull request #2 from upiq/master

collective.teamwork updates since Dec 2013
Merge branch 'master' of github.com:collective/collective.teamwork