update schema version (done by Xcode 6)
Merge remote-tracking branch 'origin/master'