old commit, much delay, many files, wow
Merge branch 'develop' of https://github.com/paulczekalla/iam_tools into develop

Conflicts:
	.gitignore
	lib/__pycache__/fileWriter.cpython-33.pyc