upates
css updates
Merge branch 'version/bj-timber' into develop

Conflicts:
	css/content.less
	stylesheet.css
updated sidebar styles