Backend model changes.
Merge branch 'master' of github.com:LordSputnik/waveplot-server into dev