Embed polls on articles, add archived attribute
Merge branch 'master' into polls

Conflicts:
	db/schema.rb
Move embedded poll query to view
Merge branch 'polls'