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

Conflicts:
	QuraanMindMapping/bin/classes/com/hm/mindmap/R$id.class
	QuraanMindMapping/gen/com/hm/mindmap/R.java