commit prj_ope 20130318
commit prj_ope 20130318
Merge remote-tracking branch 'origin/Humberto' into Felipe

Conflicts:
	application/views/header.php