Manual merge of the spectrogram trunk

There was not commited files from spectrogram (damn github app!!) so I
updated the whole directory with new features from spectrogram.
Now master should be completely updated also with the new project files.