updated
Merge branch 'master' of github.com:xml-director/xmldirector.plonecore

Conflicts:
	travis.cfg