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

Conflicts:
	wp-content/plugins/klimotion_post_types/klimoPT_idea_form.php
Merge branch 'master' of https://github.com/beetleskin/klimotion

Conflicts:
	wp-content/plugins/klimotion_post_types/klimoPT_idea_form.php