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 branch 'master' into mb_errorMessage
Merge branch 'master' into mb_errorMessage
add new error page for general error and a service name not working
currently
Merge commit '87ea884419af41071c6a334a32a3d3b4e6222f38'
Merge branch 'mixxxdj/mixxx/tree/master' into 'esbrandt/mixxx/tree/master'

Conflicts:
	mixxx/src/widget/wtracktableview.cpp
Fix merge conflict from last commit
This adds the missing 2/3 and 4/4 BPM options to the BPM tab in the trackeditor window. It also adds some tooltips and fixes the tab order. Could use some wordsmithing on the tooltips though. Thanks.
Merge branch 'master' into mb_errorMessage
Error pages work, ui files need some work
Merge branch 'master' into mb_errorMessage
Arrange BPM buttons in track editor in 1 2x2 grid
Ignore some build results from git
Fixes to Traktor Kontrol X1 mapping
Fix for bug 1033375: midi in/out port matching does not support X1

- change the name matching rule to explicitly match From: and To: in
  beginning of name strings. Previously string 'traktor' had incorrect
  match here to 'to' string, failing mapping of the ports
- strip ' input port ' and ' output port ' from traktor device names
- add unit test for actual X1 names to unit tests
Fixes to X1 mapping
Merge remote-tracking branch 'upstream/master' into mb_errorMessage
remove html code from .ui
fix parenthesis of emit statements
add enum for network error