clean up code
Improve sorting in the track tables BPM Options submenu

Sort by the most used options and add some separators for clarity.
Also rename the submenu from BPM Settings > BPM Options. IMO this is
the more correct term since the menu contains the available options for
the BPM setting of a track.
applied patch from launchpad
merge with upstream
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into mb_errorMessage
Fix version/branch reporting.

* Include build.h in dlgabout.cpp
* Call MixxxApp::logBuildDetails() in MixxxApp constructor.
Fix tests.
Move some needed vars into protected part of WOverview class
Move WOverview::drawNextPixmapPart() into new class WOverviewLMH
Cosmetic cleanup in woverview.h
HSV renderer for the woverview widget
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into mb_errorMessage
add new error page for general error and a service name not working
currently
Merge pull request #16 from daschuer/atomic-co

Remove CO* constructor to COT. Cleanups.
Merge remote-tracking branch 'upstream/master'
Merge commit '87ea884419af41071c6a334a32a3d3b4e6222f38'
Merge branch 'mixxxdj/mixxx/tree/master' into 'esbrandt/mixxx/tree/master'

Conflicts:
	mixxx/src/widget/wtracktableview.cpp
Cherry-pick schema version 20 from auto-dj-crates branch.
Fix merge conflict from last commit