Moving many things to front-end with amgic of AngularJS
Merging changes