Merge branch 'master' into HEAD

Merge branch 'master' into HEAD

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.jdt.core.prefs
	src/camidion/chordhelper/ButtonIcon.java
	src/camidion/chordhelper/ChordDisplayLabel.java
	src/camidion/chordhelper/ChordHelperApplet.java
	src/camidion/chordhelper/ChordTextField.java
	src/camidion/chordhelper/InversionAndOmissionLabel.java
	src/camidion/chordhelper/MidiChordHelper.java
	src/camidion/chordhelper/anogakki/AnoGakkiPane.java
	src/camidion/chordhelper/chorddiagram/CapoSelecterView.java
	src/camidion/chordhelper/chorddiagram/ChordDiagram.java
	src/camidion/chordhelper/chorddiagram/ChordDiagramDisplay.java
	src/camidion/chordhelper/chordmatrix/ChordButtonLabel.java
	src/camidion/chordhelper/chordmatrix/ChordGuide.java
	src/camidion/chordhelper/chordmatrix/ChordMatrix.java
	src/camidion/chordhelper/chordmatrix/ChordMatrixListener.java
	src/camidion/chordhelper/mididevice/AbstractMidiChannelStatus.java
	src/camidion/chordhelper/mididevice/AbstractMidiStatus.java
	src/camidion/chordhelper/mididevice/AbstractVirtualMidiDevice.java
	src/camidion/chordhelper/mididevice/MidiCablePane.java
	src/camidion/chordhelper/mididevice/MidiConnecterListModel.java
	src/camidion/chordhelper/mididevice/MidiConnecterListView.java
	src/camidion/chordhelper/mididevice/MidiDesktopPane.java
	src/camidion/chordhelper/mididevice/MidiDeviceDialog.java
	src/camidion/chordhelper/mididevice/MidiDeviceFrame.java
	src/camidion/chordhelper/mididevice/MidiDeviceInOutType.java
	src/camidion/chordhelper/mididevice/MidiDeviceModelList.java
	src/camidion/chordhelper/mididevice/MidiDeviceTree.java
	src/camidion/chordhelper/mididevice/MidiDeviceTreeModel.java
	src/camidion/chordhelper/mididevice/MidiSequencerModel.java
	src/camidion/chordhelper/mididevice/SequencerMeasureView.java
	src/camidion/chordhelper/mididevice/SequencerTimeView.java
	src/camidion/chordhelper/mididevice/VirtualMidiDevice.java
	src/camidion/chordhelper/midieditor/Base64Dialog.java
	src/camidion/chordhelper/midieditor/DefaultMidiChannelComboBoxModel.java
	src/camidion/chordhelper/midieditor/DurationForm.java
	src/camidion/chordhelper/midieditor/HexSelecter.java
	src/camidion/chordhelper/midieditor/HexTextForm.java
	src/camidion/chordhelper/midieditor/KeySignatureLabel.java
	src/camidion/chordhelper/midieditor/KeySignatureSelecter.java
	src/camidion/chordhelper/midieditor/MidiChannelButtonSelecter.java
	src/camidion/chordhelper/midieditor/MidiChannelComboBoxModel.java
	src/camidion/chordhelper/midieditor/MidiChannelComboSelecter.java
	src/camidion/chordhelper/midieditor/MidiEventDialog.java
	src/camidion/chordhelper/midieditor/MidiMessageForm.java
	src/camidion/chordhelper/midieditor/MidiProgramFamilySelecter.java
	src/camidion/chordhelper/midieditor/MidiProgramSelecter.java
	src/camidion/chordhelper/midieditor/MidiSequenceEditor.java
	src/camidion/chordhelper/midieditor/NewSequenceDialog.java
	src/camidion/chordhelper/midieditor/PlaylistTableModel.java
	src/camidion/chordhelper/midieditor/SequenceTickIndex.java
	src/camidion/chordhelper/midieditor/SequenceTrackListTableModel.java
	src/camidion/chordhelper/midieditor/SequencerSpeedSlider.java
	src/camidion/chordhelper/midieditor/TempoSelecter.java
	src/camidion/chordhelper/midieditor/TickPositionModel.java
	src/camidion/chordhelper/midieditor/TimeSignatureSelecter.java
	src/camidion/chordhelper/midieditor/TrackEventListTableModel.java
	src/camidion/chordhelper/midieditor/VelocitySelecter.java
	src/camidion/chordhelper/music/AbstractNoteTrackSpec.java
	src/camidion/chordhelper/music/AbstractTrackSpec.java
	src/camidion/chordhelper/music/Chord.java
	src/camidion/chordhelper/music/ChordProgression.java
	src/camidion/chordhelper/music/DrumTrackSpec.java
	src/camidion/chordhelper/music/FirstTrackSpec.java
	src/camidion/chordhelper/music/Key.java
	src/camidion/chordhelper/music/MIDISpec.java
	src/camidion/chordhelper/music/MelodyTrackSpec.java
	src/camidion/chordhelper/music/Music.java
	src/camidion/chordhelper/music/NoteSymbol.java
	src/camidion/chordhelper/music/Range.java
	src/camidion/chordhelper/music/SymbolLanguage.java
	src/camidion/chordhelper/pianokeyboard/MidiKeyboardPanel.java
	src/camidion/chordhelper/pianokeyboard/PianoKeyboard.java
	src/camidion/chordhelper/pianokeyboard/PianoKeyboardAdapter.java
	src/camidion/chordhelper/pianokeyboard/PianoKeyboardListener.java
	src/camidion/chordhelper/pianokeyboard/PianoKeyboardPanel.java