Changed some stuff to support databinding
Merge branch 'master' of github.com:software-engineering-amsterdam/poly-ql