Fixed indentation, missing semicolons
Fixed indentation; missing semicolons; misspelled var name
Merge remote-tracking branch 'upstream/development' into development

Conflicts:
	client/scripts/pearsonApi.js
Merge pull request #3 from ndhoule/development

Style, indentation, misspelled var name, missing semicolon fixes