CC-2301 : removing shift buttons since it's disabled for this release.
Merge branch 'master' of dev.sourcefabric.org:airtime