Welcome Email
other registration fixes
Fixed HTML Email Confirmation
New Relic
Merge remote-tracking branch 'upstream/master' into oauth

Conflicts:
	Gemfile
	Gemfile.lock
WIP - handle API session timeout