Minor markup edits
Merge branch 'master' into heather
Style and Task assignment
Merge branch 'master' into heather

Conflicts:
	app/controllers/tasks_controller.rb
	app/models/task.rb
	app/views/pages/_admin.html.erb
	app/views/tasks/_form.html.erb