good Merge branch 'master' of bitbucket.org:mogga/python-dirtt
good
Merge branch 'master' of bitbucket.org:mogga/python-dirtt

Conflicts:
	dirtt/data/templates/dshng/project.xml
	dirtt/data/templates/dshng/sequence.xml
	dirtt/data/templates/dshng/shot.xml
	dirtt/data/templates/dshng/symlinks.xml

robmoggach/python-dirtt