Update build scripts.
Merge branch 'master' into cmake-1.5-development
Fixes sample code that does not work.
Fix cmake and build scripts.
modify build-ios.sh
Merge branch 'cmake-1.5-development' into 1.5-development