Collide
Merge branch 'master' of https://github.com/SeoRoman/Tasks

Conflicts:
	public/angularjs/modules/Project/views/project.blade.php