[2014-11-07] Module
Merge remote-tracking branch 'origin/master'

Conflicts:
	V7cma/WebContent/jsp/v8/inc_mod_list.jsp
	V7cma/WebContent/jsp/v8/mod_main.jsp
	V7cma/src/com/imagsky/v8/constants/ModuleTemplateUIConstants.java