Modified .pro file for Mac
Merge branch 'master' of github.com:Barobo/QtBaroboLink
Merge branch 'master' of github.com:Barobo/QtBaroboLink
Merge branch 'master' of github.com:Barobo/QtBaroboLink
Removed acceleration dialog from control panel
Event forwarding now flows through BaroboLink
Merge branch 'master' into dev_eventForwarding
Joint control should be disabled at startup
Merge branch 'master' of github.com:Barobo/QtBaroboLink
Bumped version to 2.0.4

Changed major version number to "2" to indicate that it is the successor to
BaroboLink 1.x series.
Merge branch 'release'

Conflicts:
	CMakeLists.txt
	controlpanel.ui
Merge branch 'master' of github.com:Barobo/QtBaroboLink
Added icon for Mac
Merge branch 'develop' of github.com:Barobo/QtBaroboLink into release
Bumped version number to 2.0.5
Merge branch 'release'

Conflicts:
	CMakeLists.txt
	QtBaroboLink.pro
Merge branch 'master' into develop