Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	SNAPLib/AlignerOptions.cpp
Merge branch 'dev' of https://github.com/amplab/snap into dev
Merge branch 'dev' of https://github.com/amplab/snap into dev
Add null check