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

Conflicts:
	res/layout/menu_lists.xml
	src/ncit/android/voicetasker/Activity_Load.java
	src/ncit/android/voicetasker/Activity_Show.java