Trivial
Merge branch 'development' of https://github.com/bashantad/Industry-project into development

Conflicts:
	app/routes.php
Trivial
Trivial
Merge branch 'development' of https://github.com/bashantad/Industry-project into development
Merge branch 'development' of https://github.com/bashantad/Industry-project into development

Conflicts:
	app/routes.php
	app/views/resources/res.blade.php
	composer.json