Retab AnnotTrack.js
Retab DraggableHTMLFeatures.js
Retab DraggableAlignments.js
Manually respace some lines for using 4 spaces per indent
Merge branch 'master' of https://github.com/GMOD/Apollo

Conflicts:
	client/apollo/js/View/Track/AnnotTrack.js