nach dem mapding
Merge branch 'master' of https://github.com/beetleskin/klimotion

Conflicts:
	wp-content/themes/klimotion_theme/functions_render.php
conflict