Removed some pages
fixed non mvc code
Merge branch 'master' of github.com:DavidRedden/organ

Conflicts:
	app/controllers/newsfeed_controller.rb
Merge branch 'master' of github.com:DavidRedden/organ

Conflicts:
	app/controllers/newsfeed_controller.rb
	app/views/groups/edit.html.erb
	app/views/groups/new.html.erb
	app/views/newsfeed/index.html.erb
	config/routes.rb