fixed incorrect link to overall.png on the Akka and Spray tutorial page
Merge pull request #16 from OleTraveler/master

fixed incorrect link to overall.png on the Akka and Spray tutorial page
Update Cli.scala

order of trait mixins
Merge pull request #19 from cvsekhar/master

Update Cli.scala. The order of the mixins matches the order in the article.
bump sbt version. remove plugins. ignore stuff
Merge pull request #21 from jamesward/fix/bump-sbt-cleanup-plugins

bump sbt version. remove plugins. ignore stuff
updated dependencies and got the web part to work
removing unused trait concerning Access-Control-Allow-Origin

fixing warnings
put in some useful plugins, also added a SeleniumTest
add a new page fruits.html based on a json service. the aim is to select a means of testing angular/ng-repeat based pages
add a new page fruits.html based on a json service. the aim is to select a means of testing angular/ng-repeat based pages
added some information
move to use PhantomJSDriver in SeleniumTest
created FruitsSpec
fixed the SeleniumTest
Merge branch 'master' of github.com:antoinell/activator-akka-spray into antoinell-master
Tidy up
Modified tutorial
Merge pull request #24 from janm399/antoinell-master

AngularJS app