modify bug
Merge branch 'dev' of https://github.com/Espier/iAndroid_ios7_voicememos into dev

Conflicts:
	res/layout/memos_delete.xml