marti dimineata
Merge branch 'master' of https://github.com/DanDragan/Voice-Tasker

Conflicts:
	src/ncit/android/voicetasker/Activity_Shopping.java
Merge branch 'master' of https://github.com/DanDragan/Voice-Tasker

Conflicts:
	src/ncit/android/voicetasker/Activity_Shopping.java