Update Card Page

update card page and copy edits
Update settings.py
Merge branch 'master' of https://github.com/swinter2011/acu into swinter2011-master

Conflicts:
	angular-phonecat/app/partials/thanks.html
Merge branch 'swinter2011-master'