Upgrade to Spring Boot 1.0.2.RELEASE
Update path to macro content
Merge remote-tracking branch 'upstream/master'