Updates to Step 1 files
Merge remote-tracking branch 'origin/step-1' into step-1

Conflicts:
	admin/helloworld.php
	helloworld.xml
	site/helloworld.php