Merge branch 'feature/list_of_users_from_course_69' into develop

Conflicts:
	app/views/web/admin/courses/index.html.haml
Merge branch 'feature/testsfixing' into develop
Adding WYSIWYG
Merge branch 'feature/material_and_task_in_course' into staging