test
Merge branch 'master' of https://github.com/commovclub/commov

Conflicts:
	oa Maven Webapp/Document/db/sql_bak/demo(c_user)20140107-104049.sql
	oa Maven
Webapp/src/main/webapp/WEB-INF/classes/com/commov/core/base/service/Base
Service.class
	oa Maven
Webapp/src/main/webapp/WEB-INF/classes/com/commov/core/base/service/Base
ServiceImpl.class
	oa Maven
Webapp/src/main/webapp/WEB-INF/classes/com/commov/core/demo/controller/U
serController.class
	oa Maven
Webapp/src/main/webapp/WEB-INF/classes/com/commov/core/demo/mapper/UserM
apper.xml
	oa Maven Webapp/src/main/webapp/WEB-INF/classes/log4j/log4j.properties
	oa Maven Webapp/src/main/webapp/resources/plugins/dv/dv.welcome.js
	oa Maven Webapp/src/main/webapp/resources/plugins/oa/oa.welcome.js
	oa Maven
Webapp/src/main/webapp/resources/plugins/wp/platform.welcome.js
test