local commit in cogeng 20141020
Merge branch 'master' of ssh://git@github.com/OSCTeam/WebServer.git

Conflicts:
	o2oCommerce/src/main/java/com/oscdev/webserver/controller/IndexController.java
	o2oCommerce/src/main/java/com/oscdev/webserver/controller/loginController.java
	o2oCommerce/src/main/webapp/WEB-INF/template/tiles-main-template.xml
	o2oCommerce/src/main/webapp/WEB-INF/views/jsp/index.jsp
	o2oCommerce/src/main/webapp/WEB-INF/views/jsp/login/login.jsp
	o2oCommerce/src/main/webapp/WEB-INF/views/layout/aboutService.jsp
	o2oCommerce/src/main/webapp/WEB-INF/views/layout/footer.jsp
	o2oCommerce/src/main/webapp/WEB-INF/views/layout/naviBar.jsp
	o2oCommerce/src/main/webapp/resources/css/aboutService/aboutService-style.css
	o2oCommerce/src/main/webapp/resources/css/common/normalize.css
	o2oCommerce/src/main/webapp/resources/css/footer/footer-style.css
	o2oCommerce/src/main/webapp/resources/css/hotPromotion/grid.css
	o2oCommerce/src/main/webapp/resources/css/hotPromotion/hotPromotion-style.css
	o2oCommerce/src/main/webapp/resources/css/style.css
	o2oCommerce/src/main/webapp/resources/js/cufon-replace.js
20141020 in cogeng 
commit after comflicts...
20141020 in cogeng; CSS dislplay:none후 이미지 크기 버그 해결