vibration changes
Merge branch 'master' of https://github.com/drkay/balance-it.git

Conflicts:
	AndroidManifest.xml