uups
Merge branch 'master' of github.com:beetleskin/klimotion

Conflicts:
	wp-content/themes/klimotion_theme/content-single-klimo_idea.php
uups
vcx

Conflicts:
	wp-content/themes/klimotion_theme/content-single-klimo_idea.php
	wp-content/themes/klimotion_theme/style.css