merge
Merge branch 'master' of https://github.com/scienceopen/python-AIRtools into upd

Conflicts:
	maxent.py
	picard.py
	rzr.py

OK
Merge branch 'upd'

OK