add resource Tasks via scaffold
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/tasks_controller.rb
	app/views/tasks/_form.html.erb
	app/views/tasks/index.html.erb
	app/views/tasks/index.json.jbuilder
	app/views/tasks/show.html.erb
	app/views/tasks/show.json.jbuilder
	db/schema.rb
	test/controllers/tasks_controller_test.rb
	test/fixtures/tasks.yml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/tasks_controller.rb
	app/views/tasks/_form.html.erb
	app/views/tasks/index.html.erb
	app/views/tasks/index.json.jbuilder
	app/views/tasks/show.html.erb
	app/views/tasks/show.json.jbuilder
	db/schema.rb
	test/controllers/tasks_controller_test.rb
	test/fixtures/tasks.yml