Add component com_aboutus
Merge remote-tracking branch 'origin/toibalo' into toibalo

Conflicts:
	templates/green/index.php