Merge branch 'master' of
https://github.com/yuchuang0606/IndustryService.git

Conflicts:
	IndustryService/src/datacontrol/UserControl.java
	IndustryService/src/datacontrol/VideoControl.java
	IndustryService/src/hibernate.cfg.xml
	IndustryService/src/proxoolconf.xml
	IndustryService/src/test/Test.java
Merge branch 'master' of
https://github.com/yuchuang0606/IndustryService.git

Conflicts:
	IndustryService/src/datacontrol/UserControl.java
	IndustryService/src/datacontrol/VideoControl.java
	IndustryService/src/hibernate.cfg.xml
	IndustryService/src/proxoolconf.xml
	IndustryService/src/test/Test.java
yc 2013-11-19 17:56:58
Merge branch 'master' of
https://github.com/yuchuang0606/IndustryService.git
yc 2013-11-21 18:19:32
yc 2013-11-21 19:51:44