fix
Merge branch 'master' of https://github.com/Arsey/fitness-schedule-wp-plugin

Conflicts:
	WP_Kivi_Schedule_Plugin.php