Merge branch 'master' of https://github.com/bvcms/bvcmsdocs

Conflicts:
source/API/API-iPhone.rst
test fix