Adding final release for build 2605
Merge branch 'master' into develop

Signed-off-by: Adam Stegman <astegman@pivotallabs.com>

Conflicts:
	Gemfile.lock