no message
no message
Merge branch 'master' of https://github.com/hkw2014/VibrationAA

Conflicts:
	background.coffee