laptop
UPDATE Migrate and DB Seed

migrate create table registers_groups and fix table groups,showcases,classes,users_activities
DB seed user add field username
UPDATE Controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/LessonChapterVideoController.php
UPDATE Controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/ActivityController.php
	app/controllers/ClassesGroupController.php
	app/controllers/LessonChapterVideoController.php
	app/database/migrations/2013_08_06_052945_create_groups_table.php
	app/routes.php