Added new theme
Merge branch 'sstoyanov-s3'

Conflicts:
	app/views/header.html