complete follow.
add recommend but not complete
Merge branch 'master' of https://github.com/CloudTour/music-tour

Conflicts:
	WebContent/WEB-INF/web.xml