fix org controller tests by adding pass and pass conf in strong params
Merge branch 'development' into org_vertical
Merge pull request #34 from spring-peepers-2014/org_vertical

fix org controller tests by editing factory girl and strong params in org controller