Add number of components in melodic
Avoid re-creating the filebrowser on feed rename by collapsing the details before any change.
Remove the note plugin.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	plugins/fcMRI/fcMRI
Merge pull request #68 from dehaes/master

Adding Number of ICA component
fix bug merging
Merge pull request #69 from dehaes/master

Fix bug merging
Changes of few comments
Re-activate Fyborg to be compatible with Tractography as well as Connectome pipelines.
put note plugin back

use case to write general note to yourself, not related to a feed
Do not enter the 0/ folder directly to be consistent along feed name changes etc.
new email global variables
handles case if no output dir provided
email admin each time we receive new dicom series
First steps in adding a tail to the job paths.
Implement local running.
Run jobs locally if the plugin offers immediate feedback (aka. plugin.status = 100).
Merge branch 'master' into folder_structure_refactoring
delete tmp files
Implement choosing of the parent folder to name a job directory.

Currently, the job directory either gets the name of the current parent folder (which is the dropzone value if the dropped element is a folder and the parent if the dropped element is a file) or a timestamp if no dropzone is part of a plugin.

Next step will be to check for an existing 0.info file and parse it for alternative naming.