Finish user destroy action
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/tasks/sample_data.rake