Folders can now be selected via the UI. Folder icons will change accordingly (open/close).
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/views/includes/sidebar.js
Folders can now be selected via the UI. Folder icons will change accordingly (open/close).