general updates to API and angular testing pages
Merge remote-tracking branch 'origin/master'