refs #29522
refs #29534
アイコン変更
refs #29522
refs #29522
Merge branch 'features/smartphone-admin'

Conflicts:
	core/src/main/java/com/aimluck/eip/portal/controls/ALVelocityPortletControl.java
	war/src/main/webapp/WEB-INF/templates/vm/controls/html/jetspeed.vm
refs #29522