Bug 822687 - Bluetooth transfer icon cut off and misaligned
Merge branch 'bug-822687' of git://github.com/guiora/gaia into guiora-bug-822687

Conflicts:
	apps/system/style/bluetooth_transfer/images/icon_bluetooth.png