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

Conflicts:
	wp-content/plugins/klimotion_post_types/css/klimoPT_forms.css