fixed add stockCount button link
Merge pull request #218 from jofomah/fix/haptic-feedback

Fix/haptic feedback
removed add stock count button
minor fixes to the UI
Merge branch 'develop' into bug/add-stock-count-not-working

Conflicts:
	app/views/home/main-activity.html
Merge pull request #219 from musamusa/bug/add-stock-count-not-working

fixed add stockCount button link
minor fixes to the UI
Merge branch 'upstream-develop' into fix/haptic-feedback

Conflicts:
	app/views/home/main-activity.html
minor fixes to the UI