Integrated 3.1.0 final

[git-p4: depot-paths = "//xFace-Apollo/branches/openxface-ios/": change = 17343]