user scaffolding and authlogic/oauth set up
added application helper methods
Merge branch 'develop' of github.com:sharocko/team-pleb-govathon into user

Conflicts:
	config/routes.rb
	db/schema.rb
schema fix from merge