2014.12.22 in home// 마이너 수정
Merge branch 'newDBConfiguration' of
https://github.com/OSCTeam/WebServer.git into newDBConfiguration

Conflicts:
	o2oCommerce/src/main/java/com/oscdev/webserver/entity/SellerInfo.java
	o2oCommerce/src/main/java/com/oscdev/webserver/repository/PromotionCommentsRepository.java
	o2oCommerce/src/main/java/com/oscdev/webserver/repository/PromotionRepository.java