doorkeeper and warden implementation
Merge branch 'master' of https://github.com/mark-monserrat/test_proj_bc

Conflicts:
	app/assets/javascripts/modules/designer/views/design-callingcard-property.client.view.html