aaa
Merge branch 'master' of http://github.com/thanhvt1609/FIS-GC0804-S4-G1

Conflicts:
	web/WEB-INF/web.xml
Merge branch 'master' of http://github.com/thanhvt1609/FIS-GC0804-S4-G1

Conflicts:
	web/WEB-INF/web.xml
	web/admin/statistic/project.xhtml
Merge branch 'master' of http://github.com/thanhvt1609/FIS-GC0804-S4-G1
Merge branch 'master' of http://github.com/thanhvt1609/FIS-GC0804-S4-G1
sxs
Merge branch 'master' of http://github.com/thanhvt1609/FIS-GC0804-S4-G1
show list  admin
add show Admin list