added vibration to notification service
Merge branch 'upstream-develop' into fix/haptic-feedback
added vibration to notification service
removed 'content="width=device-width, initial-scale=1"' cause fast click needs it turned off to work
Merge pull request #218 from jofomah/fix/haptic-feedback

Fix/haptic feedback
Merge branch 'develop' into bug/add-stock-count-not-working

Conflicts:
	app/views/home/main-activity.html