Fix conflicts. Merge.
Fix conflicts. Merge.


LaravelCollective/html,quentinyang/html,tofarias/html,jarektkaczyk/html,vluzrmos/collective-html,barryvdh/html,djh101/html,ankalus/html,EspadaV8/html,waynedmustt/html,sebdesign/html,grave2000/laravelcollective_html,znsstudio/html,ywjrg/html,vira-lytvynenko/html,vlakoff/html-1,cgrossde/html,laravie/html,bsampaio/collective-html,wmather/html,StefanPrintezis/html,rajatsharma94/html