Initial Size | ClearAll Button
Initial Size | ClearAll Button
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/assets/javascripts/global.js.coffee
Merge branch 'zhipeng-jia'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/assets/javascripts/global.js.coffee
Merge branch 'master' into zhipeng-jia
Can now detect some input errors.
Can now detect some more input errors.
Merged class Gate, Measure, MeasureD
Some small new features
Merged class Gate, Measure, MeasureD
Some small new features
Merged class Gate, Measure, MeasureD
Some small new features
Merged several files into AddSingleCellComponent
Adjusted APIs about SelectRow
Adjusted APIs about SelectRowOrColumn
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/assets/javascripts/qcircuit_editing/helper.js.coffee
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/assets/javascripts/qcircuit_editing/helper.js.coffee

Bug with MeasureTab
Merge branch 'master' of https://github.com/zhipeng-jia/qcircuit-gui
Merged.
Added lost files.
Fixed bug about SelectRow when firstClick = secondClick.
Change Multirow to MultiRow
Ignore databse.yml