up localization
fix conflicts between 'up-localization' and 'develop'

Conflicts:
	includes/theme_shortcodes/roundabout.php