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

Conflicts:
	bin/classes/ncit/android/voicetasker/Activity_List$1.class
	bin/classes/ncit/android/voicetasker/Activity_List$2$1.class
	bin/classes/ncit/android/voicetasker/Activity_List$2.class
	bin/classes/ncit/android/voicetasker/Activity_List$3.class
	bin/classes/ncit/android/voicetasker/Activity_List$4.class
	bin/classes/ncit/android/voicetasker/Activity_List$5.class
	bin/classes/ncit/android/voicetasker/Activity_List.class
	res/layout/shopping_item_layout.xml
Merge branch 'master' of https://github.com/DanDragan/Voice-Tasker

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