new tax and fields
Merge branch 'master' of github.com:redelivre/flacso

Conflicts:
	functions.php