控制器
tv
classpath
Merge branch 'master' of https://git.oschina.net/komelio/ticket_all

Conflicts:
	doc/鑵捐揪璁?鐢靛瓙绁ㄥ姟绯荤粺瑙ｅ喅鏂规-20131013.doc