ed
ediy
Merge branch 'master' of https://github.com/ovidio43/firat

Conflicts:
	wp-content/themes/themeFirat/include/administrative-step7.php
	wp-content/themes/themeFirat/include/educational-step7.php