Added a page Credit Card under Settings
showing exiting card xxxx-xxxx-xxxx-1234 and changing card details from that page
Merge branch 'CreditCard' into Events

Conflicts:
	api/userprofile/api.py
	client/js/controllers.js
Merge Comle
Merge branch CreditCard into Events