change voice name edit function
change conflictMerge branch 'dev' of https://github.com/Espier/iAndroid_ios7_voicememos into dev

Conflicts:
	src/org/espier/voicememos7/util/MemosUtils.java