Using ProjEstimate with Passenger (refs: #537)
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	Gemfile