Merge branch '4.1' of https://github.com/laravel/framework

Conflicts:
	src/Illuminate/Foundation/Application.php
Merge branch 'master' of https://github.com/laravel/framework

Conflicts:
	src/Illuminate/Foundation/Application.php