wip: add angular data binding with controller
merge conflit fix