fix
fix
Merge branch 'master' of https://github.com/xiaoxu193/notesdrop

Conflicts:
	.project
fedora