edit text domain cpall
Merge branch 'master' of github.com:github-sprint3r/gosoft_group_02

Conflicts:
	allmap/src/main/webapp/jsp/login.jsp
Merge branch 'master' of github.com:github-sprint3r/gosoft_group_02

Conflicts:
	allmap/src/main/webapp/jsp/login.jsp