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

Conflicts:
	WebContent/user/account/account.jsp
Merge branch 'master' of git@github.com:MartinBonnie/BMW.git