.
Merge branch 'master' into zendesk_laptop

Conflicts:
	.gitignore