Latest changes for CUP.
Merge branch 'master' of https://github.com/ipundit/wycliffe_web_services