added form formatting
added fields
Merge branch 'v7.1-03-14-2013'

Conflicts:
	app/models/comment.rb