Homepage work
Merge branch 'master' into groups_ban
Homepage nearly done
fixed first registration page issue
Merge branch 'master' into bugz
Merge branch 'master' into googapi7

Conflicts:
	app/controllers/places_controller.rb