AngularJS
Merge branch 'master' of https://github.com/xeredi/portico.git
AngularJS 1.2.16
Mybatis 3.2.7
Struts 2.3.16.1 -> 2.3.16.2
PDF
PDF
PDF
Merge branch 'master' of https://github.com/xeredi/portico.git

Conflicts:
	integra-portico-business/src/main/java/xeredi/integra/model/bo/util/PdfUtil.java
	integra-portico-test/src/test/java/xeredi/integra/model/bo/util/PdfUtilTest.java