Some changes in directory_controller.js
Some minor syntactical fixes
Again some minor syntactical stuff
Merge remote branch 'origin/client_review' into laura_client2

Conflicts:
	public/system/js/directory_view.js
	public/system/js/directory_view_content.js