Combing my project with the current repo

I only changed some WebContent items.