update Plist
Merge branch 'master' of https://github.com/jazzlly/Notes

Conflicts:
	tmp/FMRadio/libs/classes.jar