prout
Merge remote-tracking branch 'origin/master'

Conflicts:
	youCourse/protected/views/jqcalendar/_form.php
prout
prout
Merge remote-tracking branch 'origin/master'

Conflicts:
	youCourse/assets/6ba4c314/css/bootstrap.css
Merge branch 'master' of https://github.com/hamisto27/wis-project-1
Merge branch 'master' of https://github.com/hamisto27/wis-project-1
Merge branch 'master' of https://github.com/hamisto27/wis-project-1
Merge branch 'master' of https://github.com/hamisto27/wis-project-1
api