Update for Spring Boot 0.5.0.M5
Merge @dsyer's changes and resolve conflicts
Rebuild the doc with new code changse