start org index page
Merge branch 'master' into laney

Conflicts:
	app/views/ideas/show.html.erb
org show page
Merge branch 'master' into laney
org show page
Merge branch 'master' into laney