ed
Merge branch 'master' of https://github.com/ovidio43/eurolimo

Conflicts:
	wp-content/themes/eurolimoTheme/lib/post-type.php