updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	Step5_Sample_Landcover_PointMethod.py
Merge branch 'master' of github.com:rmichie/TTools