Add three-way binding between wave model, database and view.
Merge branch 'threeWay' into develop