g
Merge branch 'master' of https://github.com/2p-hala/quraanmindmapping

Conflicts:
	QuraanMindMapping/bin/classes/com/hm/mindmap/R$drawable.class
	QuraanMindMapping/bin/classes/com/hm/mindmap/R$id.class
	QuraanMindMapping/bin/classes/com/hm/mindmap/R$layout.class
	QuraanMindMapping/bin/classes/com/hm/mindmap/R$menu.class
	QuraanMindMapping/bin/classes/com/hm/mindmap/R$string.class
	QuraanMindMapping/bin/classes/com/hm/mindmap/R$style.class
	QuraanMindMapping/gen/com/hm/mindmap/R.java
Merge branch 'master' of https://github.com/2p-hala/quraanmindmapping

Conflicts:
	QuraanMindMapping/bin/classes/com/hm/mindmap/R$drawable.class
	QuraanMindMapping/bin/classes/com/hm/mindmap/R$id.class
	QuraanMindMapping/bin/classes/com/hm/mindmap/R$layout.class
	QuraanMindMapping/bin/classes/com/hm/mindmap/R$menu.class
	QuraanMindMapping/bin/classes/com/hm/mindmap/R$string.class
	QuraanMindMapping/bin/classes/com/hm/mindmap/R$style.class
	QuraanMindMapping/gen/com/hm/mindmap/R.java
audio
Merge branch 'master' of https://github.com/2p-hala/quraanmindmapping

Conflicts:
	QuraanMindMapping/gen/com/hm/mindmap/R.java
	QuraanMindMapping/src/com/hm/mindmap/BranchDetailsActivity.java
sd
done