short name
change name
merge code
merge code
Merge branch 'dev' of github.com:Espier/iAndroid_ios7_voicememos into dev