Merge branch 'master' of github-pers:creativelive/cl-styles

Conflicts:
	.gitignore
CAL-1: upcoming tile fixes for the live banner
Merge branch 'master' of github-pers:gabesoft/cl-styles

Conflicts:
	.gitignore