c
xx
Merge branch 'master' of https://github.com/yoonsica/platform.git

Conflicts:
	src/main/java/com/ceit/vic/platform/daoImpl/IDPROVIDERDaoImpl.java