view update
css delete
Merge branch 'master' of https://github.com/ucampPro/project.git

Conflicts:
	[002,005,006,012,013]project/target/classes/.gitignore