앱 아이콘 이미지
Merge branch 'layout_from_login' into layout_to_merge

Conflicts:
	src/main/webapp/WEB-INF/views/createApp.jsp