Fixed javascript, made simple but very direct. Waiting for angular bindig.
Merge remote-tracking branch 'origin/master'