directory params changed
edit, destroyed function added
Merge commit 'ba14a43c984151706cf69e4a859a86b4023f2531' into develop

Conflicts:
	app/controllers/directories_controller.rb