layout general
Merge remote-tracking branch 'origin/master'

Conflicts:
	global/css/bootstrap.css
	global/css/style.css
	global/less/variables.less
+ poster
+ poster