text commit from Xcode; fixed a bunch of warnings
Merge remote-tracking branch 'origin/master'