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

Conflicts:
	bin/classes/ncit/android/voicetasker/Activity_Shopping$1.class
	bin/classes/ncit/android/voicetasker/Activity_Shopping$2$1.class
	bin/classes/ncit/android/voicetasker/Activity_Shopping$2.class
	bin/classes/ncit/android/voicetasker/Activity_Shopping$3.class
	bin/classes/ncit/android/voicetasker/Activity_Shopping$4.class
	bin/classes/ncit/android/voicetasker/Activity_Shopping.class
	src/ncit/android/voicetasker/Activity_Shopping.java
	src/ncit/android/voicetasker/ListAdapter.java