remove bak files
Merge branch 'eng.local' into spa.local

Conflicts:
	css/cms-index.cssBAK2
	css/index.cssBAK2
Merge branch 'spa.local' into spa