update action, dal
Merge branch 'master' of https://github.com/anhdv282/IXJ

Conflicts:
	Assignment/web/ViewGroup.jsp