Merge branch 'master' of https://github.com/doctor-wap/all_notes

Conflicts:
	resources/lib/links.txt
Merge branch 'master' of https://github.com/doctor-wap/all_notes