Commit build file.
Commit build file.
Merge remote-tracking branch 'origin/joomla-tutor' into joomla-tutor

Conflicts:
	administrator/components/com_helloworld/controllers/index.html
	administrator/components/com_helloworld/index.html
	administrator/components/com_helloworld/models/forms/index.html