Added detuning of the oscillator...
resolving merge conflicts
resolving more merge errors
Merge branch 'master' of github.com:andreaslof/webemin
retuned some stuff
Merge branch 'master' of github.com:andreaslof/webemin
moved the detuning into the first controller