djcoder100
diff --git a/‎app/assets/javascripts/main.coffee
+1 b/‎app/assets/javascripts/main.coffee
+1
diff --git a/‎app/views/main.scala.html
+5-3 b/‎app/views/main.scala.html
+5-3
diff --git a/‎conf/routes
+15-13 b/‎conf/routes
+15-13
diff --git a/‎project/Build.scala
+5 b/‎project/Build.scala
+5
diff --git a/‎public/BirdWatch.html
-18 b/‎public/BirdWatch.html
-18
@@ -5,6 +5,7 @@ require ["barchart", "cloud", "wordcount"], (chart, cloud, wordCount) ->
   lastBarUpdate = new Date().getTime() - 2000
   q = $("#queryString").text()
 
+  # preview for search engine / preview
   $("#wordcloud_preview").remove()
 
   barchart = chart.BarChart(q)  
 
@@ -7,10 +7,12 @@
         <title>@title</title>
         <link rel="stylesheet" media="screen" href="@routes.Assets.at("stylesheets/main.css")">
         <link rel="shortcut icon" type="image/png" href="@routes.Assets.at("images/favicon.png")">
-        <script src="@routes.Assets.at("javascripts/vendor/jquery-1.9.0.min.js")" type="text/javascript"></script>
-        <script src="@routes.Assets.at("javascripts/vendor/d3.v2.8.1.min.js")" type="text/javascript"></script>
-        <script src="@routes.Assets.at("javascripts/vendor/knockout-2.2.1.min.js")" type="text/javascript"></script>
+        <link rel="stylesheet" media="screen" href="@routes.WebJarAssets.at(WebJarAssets.locate("bootstrap.min.css"))">
 
+        <script src="@routes.WebJarAssets.at(WebJarAssets.locate("jquery.min.js"))"></script>
+        <script src="@routes.WebJarAssets.at(WebJarAssets.locate("d3.min.js"))"></script>
+        <script src="@routes.WebJarAssets.at(WebJarAssets.locate("knockout.js"))"></script>
+                
         <script>
          (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
             (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
 
@@ -1,26 +1,28 @@
 # BirdWatch Routes
 # ~~~~
 
-GET /                         controllers.Twitter.tweetList(q: String ?="")
-GET /search                   controllers.Twitter.tweetList(q: String ?="")
+GET     /                           controllers.Twitter.tweetList(q: String ?="")
+GET     /search                     controllers.Twitter.tweetList(q: String ?="")
 
 # had to do this because I did not want people bookmarking the IP, which was on Twitter...
-GET /tweets                   controllers.Application.named
-GET /tweetFeed                controllers.Twitter.tweetFeed(q: String ?= "")
-GET /rawTweetFeed             controllers.Twitter.rawTweetFeed
+GET     /tweets                     controllers.Application.named
+GET     /tweetFeed                  controllers.Twitter.tweetFeed(q: String ?= "")
+GET     /rawTweetFeed               controllers.Twitter.rawTweetFeed
 
-GET /countFeed                controllers.Twitter.countFeed
+GET     /countFeed                  controllers.Twitter.countFeed
 
-GET /accessLog                controllers.AccessLog.index(token: String ?="")
+GET     /accessLog                  controllers.AccessLog.index(token: String ?="")
 
 # Adding and removing topics from Twitter stream
-GET /topic/add                controllers.Topics.add(topic: String ?="", token: String ?="")
-GET /topic/remove             controllers.Topics.remove(topic: String ?="", token: String ?="")
+GET     /topic/add                  controllers.Topics.add(topic: String ?="", token: String ?="")
+GET     /topic/remove               controllers.Topics.remove(topic: String ?="", token: String ?="")
 
 # Tweets as JSON
-GET /tweets/latest            controllers.Twitter.tweetsJson(n: Int ?= 50, q: String ?="")
-GET /rawTweets/latest         controllers.Twitter.rawTweetsJson(n: Int ?= 50)
+GET     /tweets/latest              controllers.Twitter.tweetsJson(n: Int ?= 50, q: String ?="")
+GET     /rawTweets/latest           controllers.Twitter.rawTweetsJson(n: Int ?= 50)
 
-GET /tweets/replay/:results    controllers.Twitter.tweetReplay(results: Int, delayMS: Int ?= 250)
+GET     /tweets/replay/:results     controllers.Twitter.tweetReplay(results: Int, delayMS: Int ?= 250)
 
-GET /assets/*file             controllers.Assets.at(path="/public", file)
+GET     /assets/*file               controllers.Assets.at(path="/public", file)
+
+GET     /webjars/*file              controllers.WebJarAssets.at(file)
@@ -8,6 +8,11 @@ object ApplicationBuild extends Build {
   val appVersion      = "1.0-SNAPSHOT"
 
   val appDependencies = Seq(
+    "org.webjars" %% "webjars-play" % "2.1.0-2",
+    "org.webjars" % "bootstrap" % "2.3.2",
+    "org.webjars" % "jquery" % "1.9.1",
+    "org.webjars" % "knockout" % "2.2.1",
+    "org.webjars" % "d3js" % "3.1.5",
     "org.reactivemongo" %% "reactivemongo" % "0.9",
     "org.reactivemongo" %% "play2-reactivemongo" % "0.9",
     "org.scalatest" % "scalatest_2.10" % "1.9.1" % "test",