just missing a close paren on the setResolver setup on the unit test intro guide
Merge pull request #1459 from belison/master

just missing a close paren on the setResolver setup on the unit test intro guide
add greenfield to company list
Controller Guide link update

Link was using relative path, which ended up being broken. Fixed link to use absolute path like other links in the guide in order to link to proper url
Merge pull request #1462 from JPBetley/master

Controller Guide link update
Update site for 1.5.1.
Merge pull request #1461 from mikepmunroe/add-company-to-about

add greenfield to company list
set correct watch a project permalink
Merge pull request #1466 from mikepmunroe/patch-2

set correct watch a project permalink
Quick typo fix on `update` method description
Merge pull request #1468 from aaronransley/patch-2

Quick typo fix on `update` method description
Merge remote-tracking branch 'base/master'

Conflicts:
	source/about.html.erb
	source/guides/getting-started/accepting-edits.md