first ms950 ---> utf-8



Signed-off-by: star52065c <star52065c@gmail.com>
first ms950 -> utf-8

Signed-off-by: star52065c <star52065c@gmail.com>
Merge branch 'master' of ssh://git@github.com/suxpro/YA801G3.git

Conflicts:
	WebContent/WEB-INF/web.xml


Signed-off-by: star52065c <star52065c@gmail.com>