WIP test API
Merge pull request #2 from junejung/development

WIP test API
Merge remote-tracking branch 'upstream/development' into development

Conflicts:
	client/scripts/pearsonApi.js