fix js. use bower for libs
merge conflicts