update
Merge branch 'master' of https://github.com/yorelandlulu/web

Conflicts:
	src/main/webapp/home.html
	src/main/webapp/news/js/list.js