Fixed merge errors in motions coffeescript
Fixed merge errors in motions coffeescript

tachyons/loomio,juliagra/loomio,isomerase/loomio,sicambria/loomio,sicambria/loomio,loomio/loomio,juliagra/loomio,labhackercd/loomio,isomerase/loomio,FSFTN/Loomio,FSFTN/Loomio,wangjun/loomio,juliagra/DBCloomio,sicambria/loomio,piratas-ar/loomio,codingnutty/loomio,digideskio/loomio,codingnutty/loomio,HadoDokis/loomio,doomergithub/loomio,annewchen/loomio,kimihito/loomio,juliagra/loomio,digideskio/loomio,HadoDokis/loomio,mlarghydracept/loomio,kimihito/loomio,piratas-ar/loomio,Collabforge/site-collabio,Collabforge/site-collabio,mhjb/loomio,labhackercd/loomio,wangjun/loomio,mhjb/loomio,gvalerin/loomio,doomergithub/loomio,wangjun/loomio,tachyons/loomio,digideskio/loomio,piratas-ar/loomio,aca13jmf/loomio,isomerase/loomio,sicambria/loomio,mlarghydracept/loomio,loomio/loomio,loomio/loomio,piratas-ar/loomio,aca13jmf/loomio,juliagra/DBCloomio,FSFTN/Loomio,mlarghydracept/loomio,labhackercd/loomio,loomio/loomio,annewchen/loomio,aca13jmf/loomio,doomergithub/loomio,isomerase/loomio,HadoDokis/loomio,mhjb/loomio,gvalerin/loomio,tachyons/loomio,juliagra/DBCloomio,Collabforge/site-collabio,FSFTN/Loomio,labhackercd/loomio,tachyons/loomio,mhjb/loomio,HadoDokis/loomio,gvalerin/loomio,annewchen/loomio,Collabforge/site-collabio,codingnutty/loomio,kimihito/loomio