index.jsp indent신경쓰고.gitignore에 bin/* 추가
Conflict 수정함
Merge branch 'develop' of github.com:NHNNEXT/2014-01-HUDI-SAGIMARA into develop

Conflicts:
	src/main/webapp/index.jsp