Merge branch 'canvaswidthfix'
Remove silly architecture limitation

Conflicts:

	package.json
Merge https://github.com/greggomann/mascp-jstools into HEAD
Attempting to merge local changes from hirenj's master branch into my own fork of the dev branch
Temporarily committing changes destined for the develop branch...
Merge branch 'master' into develop
Added new predictive track with MASCP.ProteotypicReader, intended for population with calculated proteotypic peptides.
Must import data into db with data-manager.js --reader MASCP.ProteotypicReader
Intermediate commit of hover feature:

Hover popup framework created, no content in popup yet
Must move popup to outer container canvas to prevent cropping
Latest hover feature commit
Adds popup on hover, displays peptide sequence
Merge branch 'develop' into hover-feature

Conflicts:
	dist/js/mascp-jstools.js
Removing proteotypic reader from this feature branch
Revisions to hover feature:
Added resizing based on amount of text displayed.
Fixed word wrap to retain whole words when present.
Fixed addBoxOverlayToElement to correctly remove redundant peptides when overlap occurs.
In popup-related functions: change variable name 'metadata' to 'popupData'
Changed type of popupData argument from string to object literal
Removed dist files from tracking
Added exception handling in canvas.growingMarket to prevent Firefox from hanging on load

Conflicts:
	dist/js/mascp-jstools.js
	dist/js/mascp-jstools.min.js
	dist/js/mascp-jstools.renderers.js
	dist/js/mascp-jstools.renderers.min.js
	js/lib/SVGCanvas.js
Changed content of popup from SVG text to HTML
Commented out extraneous code which was throwing an error in canvas.growingMarker
Changed test for popup existence in CondensedSequenceRenderer to avoid DOM error when not in existence
Remove the __defineGetter/Setter__ methods

They're old JavaScript, so we move to the
standardised version of creating getters/setters