set timeouts
Merge branch 'develop2'

* develop2:
  set timeouts
Merge branch 'master' into develop3

* master:
  set timeouts

Conflicts:
	public/apps/equifit/app/entities/equifits.js
	public/apps/equifit/app/entities/forms.js