Merge branch 'master' into master_sync
Fix MockScaler.
Get rid of redundant if statement.
Reset user offset when track unloads too.
Add BpmControl::getBeatContext to standardize how we calculate first/prev/length/percentages from beat data.
Add BpmControl::shortestPercentageChange, a utility method for calculating the shortest distance in a mod-1.0 space.
Improve comment.
Use getBeatContext and shortestPercentageChange in BpmControl::getSyncAdjustment
to deal with beat fraction wrap-around. Add some TODOs about future improvements
to the sync controller (our assumptions are such that tracks going faster than a
beat per callback can screw up the controller).
Merge branch 'master_sync' of github.com:mixxxdj/mixxx into master_sync

Conflicts:
	src/engine/bpmcontrol.cpp
	src/test/mockedenginebackendtest.h
Argh, remove accidentally committed debug messages.
Add BpmControlTest.
Merge branch 'master' into master_sync

Conflicts:
	src/test/bpmcontrol_test.cpp
Merge remote-tracking branch 'mixxxdj/master_sync' into master_sync
Merge pull request #108 from rryan/master_sync

Master sync