Completed User Story 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	content/browsertrust/BTrust.js
	content/test/Test.js