Fixed merge mistake.
Fixed merge mistake.

adrianha/sails,hokkoo/sails,yinhe007/sails,togusafish/logikinc-_-sails,shaunstanislaus/sails,alex-zhang/sails,metidia/sails,ctartist621/sails,sunnycmf/sails,pmq20/sails,baracudaengine/SailsUi,konstantinzolotarev/sails,JumpLink/sails,krishnaglick/sails,dbuentello/sails,saronwei/sails,curphey/sails,giano/sails,rkJun/sails,leedm777/sails,apowers313/sails,kevinburke/sails,jianpingw/sails,hokkoo/sails,antoniopol06/sails,mauricionr/sails,saniko/soundcloud_mithril,taogb/sails,dylannnn/sails,EdisonSu768/sails,yangchuoxian/sails,artBrown/sails,tjwebb/sails,saniko/soundcloud_mithril,Karnith/sails-for-gulp,scippio/sails,erkstruwe/sails,vip-git/sails,mphasize/sails,harrissoerja/sails,leobudima/sails,jsisaev1/sails,boarderdav/sails,zand3rs/sails,marnusw/sails,janladaking/sails,wsaccaco/sails,denismars/sails,tempbottle/sails,Hanifb/sails,xjpro/sails-windows-associations,winlolo/sails,anweiss/sails,alexferreira/sails,t2013anurag/sails,justsml/sails,mnaughto/sails,antodoms/sails,giano/sails,cazulu/sails,jianpingw/sails,hellowin/sails,prssn/sails,jenalgit/sails,rlugojr/sails,Benew/sails,youprofit/sails,haavardw/sails,vip-git/sails,Shyp/sails,listepo/sails,balderdashy/sails,Josebaseba/sails,rlugojr/sails,calling/sails,jakutis/sails,AnyPresence/sails,corbanb/sails