머지하기위한 커밋
Merge branch 'develop' of https://github.com/NHNNEXT/2014-01-HUDI-SAGIMARA into develop

Conflicts:
	src/main/java/framework/FrontController.java
	src/main/webapp/javascripts/admin_login.js
	src/main/webapp/stylesheets/admin.css