Staccato Implementation
Midi Recorder Working
Test Commit
Merge branch 'master' of https://github.com/BrainComputationLab/MUSE

Conflicts:
	MUSE-GUI/MUSE.pro.user
1_12_2014 - Merge branch 'Midi'

Conflicts:
	MUSE-GUI/MUSE.pro.user
	MUSE-GUI/sequencerInterface.cpp
	MUSE-GUI/sequencerInterface.h
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/CL.read.1.tlog
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_advancedsequencer.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_driver.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_driverdump.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_driverwin32.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_edittrack.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_file.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_fileread.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_filereadmultitrack.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_fileshow.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_filewrite.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_filewritemultitrack.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_keysig.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_manager.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_matrix.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_midi.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_msg.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_multitrack.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_parser.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_process.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_queue.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_sequencer.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_showcontrol.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_showcontrolhandler.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_smpte.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_sysex.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_tempo.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_tick.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/jdksmidi_track.obj
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/Debug/vc110.pdb
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/jdksmidi.sdf
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/jdksmidi.v11.suo
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/x64/Debug/CL.write.1.tlog
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/x64/Debug/Lib-link.read.1.tlog
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/x64/Debug/Lib-link.write.1.tlog
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/x64/Debug/cl.command.1.tlog
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/x64/Debug/jdksmidi.lastbuildstate
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/x64/Debug/jdksmidi.log
	workingmidiplayer/jdksmidi-master/jdksmidi-master/build/vs2010/x64/Debug/lib.command.1.tlog
	workingmidiplayer/miditest--mediaplayer/miditest.sdf
	workingmidiplayer/miditest--mediaplayer/miditest.v11.suo
	workingmidiplayer/miditest--mediaplayer/miditest/Debug/RtMidi.obj
	workingmidiplayer/miditest--mediaplayer/miditest/Debug/jdksmidi_test_sequencer.obj