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

Conflicts:
	src/org/espier/voicememos7/ui/VoiceWaveView.java
Merge branch 'dev' of https://github.com/Espier/iAndroid_ios7_voicememos into dev