te
aa
aa
Merge branch 'master' of github.com:MartinBonnie/BMW

Conflicts:
	build/classes/struts/struts-admin.xml
	resource/struts/struts-admin.xml
a
admin
Merge branch 'master' of github.com:MartinBonnie/BMW

Conflicts:
	WebContent/user/account/account.jsp