working on credit card
working on credit card
Merge origin/master

Conflicts:
	src/main/webapp/WEB-INF/springsecurity.xml