changed links to API docs to match Matei's latest changes
Merge branch 'mybranch'