Wooo
Merge branch 'master' into removed-merged
Return the correct pull object
Looking good
Merge branch 'removed-merged' into cr-qa-after-commits

Conflicts:
	api/controllers/HomeController.js
Final twersk