Merge remote-tracking branch 'origin' into laravel
commit all
Merge branch 'laravel' of https://github.com/tianweilong/laravel-1 into laravel

Conflicts:
	public/js/jquery-1.10.2.min.js