Correct smtp settings location (moved from CommonConfig to ApiConfig)
Merge remote-tracking branch 'origin/develop' into develop