form search tabs html completed
Merge branch 'master' of github.com:paulovillani/camprulho

Conflicts:
	portal/static/css/portal_base.css