Change body `background` css rule to `background-color`
Merge branch 'develop' of github.com:Planview/test into develop

Conflicts:
	style.css