Merge branch 'master' of https://github.com/Smoss/autopsy

Conflicts:
	Testing/script/regression.py