CC validation update
Merge branch 'feature/CC2'

Conflicts:
	protected/views/order/create.php