Fixed some bugs
Merge remote-tracking branch 'origin/ks_additive_schwarz' into ks_additive_schwarz

Conflicts:
	lib/staggered_overlap_utilities.h