s
Merge branch 'master' of https://github.com/geronimod/ideas

Conflicts:
	app/models/user.rb
Merge branch 'master' of https://github.com/geronimod/ideas
Merge branch 'master' of https://github.com/geronimod/ideas
Merge branch 'master' of https://github.com/geronimod/ideas
Merge branch 'master' of https://github.com/geronimod/ideas
test tags
Merge branch 'master' of https://github.com/geronimod/ideas

Conflicts:
	spec/models/idea_spec.rb