test commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	fuel/app/classes/controller/welcome.php