Branch: master

	* atpl/snippets.c: Updated some snippets names.
	* plugs.vim: changed path of mysql binary directory.
Merge remote-tracking branch 'refs/remotes/origin/master'
No conflicts at all. Only a diffence in changelog file.