Merge branch 'master' of github.com:averissimo/BGFit
Merge branch 'master' of github.com:averissimo/BGFit
Merge branch 'master' of github.com:averissimo/BGFit
Merge branch 'master' of github.com:averissimo/BGFit
adds equation definition to new dynamodel
changes made directly in prd
Merge branch 'master' of github.com:averissimo/BGFit
Merge branch 'master' of github.com:averissimo/BGFit
more changes in new dyna model process
allows to associate all measurements in experiment with a given model
corrections to model generation
Merge branch 'v1'
adds equation definition to new dynamodel
more changes in new dyna model process
allows to associate all measurements in experiment with a given model
corrections to model generation
Merge branch 'v1'
Merge branch 'v1'

Conflicts:
	app/assets/javascripts/dyna_models.js.coffee
	app/assets/stylesheets/custom_forms.css.scss
	app/views/dyna_models/definition.html.erb
Merge branch 'v1'

Conflicts:
	app/models/dyna_model.rb
better worflow for creating models