Modification for return url after login in checkout process
Different logos for local and server
Merge branch 'CartAndPayment' into development
Updated .gitignore
Merge branch 'CartAndPayment' into development
Merge branch 'development' of https://github.com/jonvellacott/AgapeConnect1 into development

Conflicts:
	.gitignore