fix ringstone -> ringtone
ringtone edit and add
Merge branch 'develop' of https://github.com/dralagen/myLazyClock into develop

Conflicts:

server-gae/services/src/main/java/org/myLazyClock/services/bean/AlarmClo
ckBean.java