fixed conflict near ln 239 in template-tags function
Merge branch 'master' of github.com:mdebartolomeo/cafnr-intl

Conflicts:
	includes/cc-cafnr-template-tags.php