Merge branch 'master' into standard
add optional external property file and eliminate need for autowired environment variable
Merge branch 'standard' of github.com:kgleong/spring-mvc-template into standard
Merge remote-tracking branch 'origin/standard' into resume-pdf
allow system property to change the font size