Externalized xml generation templates
Merge branch 'master' of https://github.com/lmlwci0m/python-lab

updates from cap-pc