jortegui
Merge branch 'master' of https://github.com/jortegui/it-scripts

Conflicts:
	addtargets.py