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

Conflicts:
	SNAPLib/AlignerOptions.cpp
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	SNAPLib/AlignerOptions.cpp
	apps/snap/Main.cpp
Merge
Merge