08082014
Merge remote-tracking branch 'origin/master'

Conflicts:
	politico/archive-perfil.php
	politico/search.php
11082014