temp commit
#gt-296 In Progress
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/layouts/site.slim
fast layout fix
#gt-296 In Progress
#gt-296 In Progress
#gt-296 In Progress
Merge remote-tracking branch 'origin/master'