Refacotring, handlebars.js, concat and minify, fixes