refine
	modified:   Libraries/drivers/K/inc/adc.h
	modified:   Libraries/drivers/K/src/adc.c
Marge
Merge branch 'master' of http://github.com/yandld/CH-K-Lib-V2.5

Conflicts:
	Project/超核K60开发板-渡鸦/0-工程模板/MDK/templete.uvopt