fixing merge issues with schema.rb
fixing merge issues with schema.rb

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