push on laptop
push on laptop
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/ActivityController.php
	app/controllers/ClassesGroupController.php
	app/controllers/ClassesGroupUserController.php
	app/controllers/LessonChapterVideoController.php
	app/controllers/LessonController.php
	app/controllers/NewsController.php
	app/views/classes/groups/create/index.blade.php
	app/views/lessons/chapters/videos/index.blade.php
	app/views/news/create/index.blade.php
	views/lessons/chapters/create/header.blade.php
push on laptop