merge 4.0 and fix conflicts.
merge 4.0 and fix conflicts.


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