Grid change
Merge branch 'master' of https://github.com/vangelis183/pbp

Conflicts:
	application/views/eventcategory/create.blade.php