Merge branch 'master' into develop

Conflicts:
	scripts/pylot-reasses-pilot-event.py

pylot/core/pick/utils.py

@@ -938,6 +938,10 @@ def checkZ4S(X, pick, zfac, checkwin, iplot):
     return returnflag
 
 
+def reassess_pilot_event():
+    pass
+
+
 if __name__ == '__main__':
     import doctest
 

scripts/pylot-reasses-pilot-event.py

@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 import argparse
+
+from pylot.core.pick.utils import reassess_pilot_event
 from pylot.core.util.version import get_git_version as _getVersionString
 from pylot.core.io.phases import reassess_pilot_event