about us updade
Merge remote-tracking branch 'origin/master'

Conflicts:
	fuel/app/views/layout/header.php