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

Conflicts:
	bin/classes/ncit/android/voicetasker/ShoppingAdapter.class
Merge branch 'master' of https://github.com/DanDragan/Voice-Tasker
week start