changes
Merge branch 'master' of https://github.com/satnambajwa85/zadovo

Conflicts:
	themes/home/views/site/course.php
	themes/home/views/site/courses.php