I merged with Johnson's code but removed js libs (angular.js, jquery.js ...)

Johnson need to use bower to replace js libs