refs #29465
印刷画面対応
Merge branch 'master' of https://github.com/aipocom/aipo.git

Conflicts:
	war/src/main/webapp/WEB-INF/templates/vm/GlobalMacros.vm