Fix conflicts. Merge.
Fix conflicts. Merge.


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