add fixed container width
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/styles/css/screen.css
add fixed container width