removed seams
Merge remote-tracking branch 'origin/master' into landonMOE
fixed compilation issues
Merge remote-tracking branch 'origin/master' into landonMOE