Inital CC implementation.
.gitignore
Merge branch 'master' into feature/CC

Conflicts:
	.gitignore
new version
Merge branch 'master' into feature/CC

Conflicts:
	.gitignore
	protected/config/main.php
cc update
Merge branch 'feature/CC'
Merge branch 'master' into feature/CC
Card Info feature
Merge branch 'feature/CC'

Conflicts:
	protected/config/main.php
	protected/controllers/CustomerController.php
	protected/views/order/create.php