update test timeout
 update conversation loading on trigger from user model
 rm get contact groups call
 rm tmp var in user model from running code
Merged 'dev'.
updates