for merge
Merge branch 'develop' of https://github.com/NHNNEXT/2014-01-HUDI-SAGIMARA into develop

Conflicts:
	src/main/webapp/admin_login.jsp