cp
Merge branch 'master' of https://github.com/ricardo-cantu/Restler

Conflicts:
	public/cc-api/Card.php
cp