updated bootstrap gem
more modular arrangement of angular files
convert angular js files to coffeescript
merge fix