Code clean up and added BackboneJS
fixed alignement problem
Merge remote-tracking branch 'origin/master' into gh-pages